diff --git a/lib/private/app.php b/lib/private/app.php
index d88855840a9aa5d062c338541d78e85893965f32..52f77535a5262fce2b34ba411f0546225910805e 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -169,8 +169,10 @@ class OC_App {
 		}
 		$appConfig = \OC::$server->getAppConfig();
 		$appStatus = $appConfig->getValues(false, 'enabled');
-		$apps = array();
 		foreach ($appStatus as $app => $enabled) {
+			if ($app === 'files') {
+				continue;
+			}
 			if ($enabled === 'yes') {
 				$apps[] = $app;
 			} else if ($enabled !== 'no') {
@@ -186,6 +188,8 @@ class OC_App {
 				}
 			}
 		}
+		sort($apps);
+		array_unshift($apps, 'files');
 		self::$enabledAppsCache = $apps;
 		return $apps;
 	}