diff --git a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts
index 9b536f84f77e9da8b3602d24706041340845a93d..646b0f57794a4b505faf537b8b7efa8516a37447 100644
--- a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts
+++ b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts
@@ -559,18 +559,6 @@ export class FileSorter implements ISorter {
 
 		// Sort Directories
 		switch (this.sortOrder) {
-			case 'default':
-			case 'modified':
-				if (statA.isDirectory && !statB.isDirectory) {
-					return -1;
-				}
-
-				if (statB.isDirectory && !statA.isDirectory) {
-					return 1;
-				}
-
-				break;
-
 			case 'type':
 				if (statA.isDirectory && !statB.isDirectory) {
 					return -1;
@@ -595,6 +583,17 @@ export class FileSorter implements ISorter {
 					return -1;
 				}
 
+				break;
+
+			default: /* 'default', 'modified' */
+				if (statA.isDirectory && !statB.isDirectory) {
+					return -1;
+				}
+
+				if (statB.isDirectory && !statA.isDirectory) {
+					return 1;
+				}
+
 				break;
 		}
 
@@ -609,11 +608,6 @@ export class FileSorter implements ISorter {
 
 		// Sort Files
 		switch (this.sortOrder) {
-			case 'default':
-			case 'mixed':
-			case 'filesFirst':
-				return comparers.compareFileNames(statA.name, statB.name);
-
 			case 'type':
 				return comparers.compareFileExtensions(statA.name, statB.name);
 
@@ -623,6 +617,9 @@ export class FileSorter implements ISorter {
 				}
 
 				return comparers.compareFileNames(statA.name, statB.name);
+
+			default: /* 'default', 'mixed', 'filesFirst' */
+				return comparers.compareFileNames(statA.name, statB.name);
 		}
 	}
 }