diff --git a/app/app.js b/app/app.js
index 5f3eb366e..57dbb4072 100644
--- a/app/app.js
+++ b/app/app.js
@@ -1,13 +1,13 @@
 'use strict';
 
-angular.module('dockerui', ['ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar'])
+angular.module('dockerui', ['ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'settings'])
     .config(['$routeProvider', function ($routeProvider) {
         $routeProvider.when('/', {templateUrl: 'app/components/dashboard/dashboard.html', controller: 'DashboardController'});
         $routeProvider.when('/containers/', {templateUrl: 'app/components/containers/containers.html', controller: 'ContainersController'});
         $routeProvider.when('/containers/:id/', {templateUrl: 'app/components/container/container.html', controller: 'ContainerController'});
         $routeProvider.when('/images/', {templateUrl: 'app/components/images/images.html', controller: 'ImagesController'});
         $routeProvider.when('/images/:id/', {templateUrl: 'app/components/image/image.html', controller: 'ImageController'});
-        $routeProvider.when('/settings', {templateUrl: 'partials/settings.html', controller: 'SettingsController'});
+        $routeProvider.when('/settings', {templateUrl: 'app/components/settings/settings.html', controller: 'SettingsController'});
         $routeProvider.otherwise({redirectTo: '/'});
     }])
     // This is your docker url that the api will use to make requests
diff --git a/partials/settings.html b/app/components/settings/settings.html
similarity index 100%
rename from partials/settings.html
rename to app/components/settings/settings.html
diff --git a/app/components/settings/settingsController.js b/app/components/settings/settingsController.js
new file mode 100644
index 000000000..44f077c8e
--- /dev/null
+++ b/app/components/settings/settingsController.js
@@ -0,0 +1,11 @@
+angular.module('settings', [])
+.controller('SettingsController', ['$scope', 'System', 'Docker', 'Settings', 'Messages',
+function($scope, System, Docker, Settings, Messages) {
+    $scope.info = {};
+    $scope.docker = {};
+    $scope.endpoint = Settings.endpoint;
+    $scope.apiVersion = Settings.version;
+
+    Docker.get({}, function(d) { $scope.docker = d; });
+    System.get({}, function(d) { $scope.info = d; });
+}]);
diff --git a/app/controllers.js b/app/controllers.js
index e9cfd42bc..67d8853d3 100644
--- a/app/controllers.js
+++ b/app/controllers.js
@@ -47,16 +47,6 @@ function getChart(id) {
     return new Chart(ctx);
 }
 
-function SettingsController($scope, System, Docker, Settings, Messages) {
-    $scope.info = {};
-    $scope.docker = {};
-    $scope.endpoint = Settings.endpoint;
-    $scope.apiVersion = Settings.version;
-
-    Docker.get({}, function(d) { $scope.docker = d; });
-    System.get({}, function(d) { $scope.info = d; });
-}
-
 function BuilderController($scope, Dockerfile, Messages) {
     $scope.template = 'partials/builder.html';
 }
diff --git a/index.html b/index.html
index 83c1ebf84..f8bc9eddc 100644
--- a/index.html
+++ b/index.html
@@ -46,6 +46,7 @@
     <script src="app/components/image/imageController.js"></script>
     <script src="app/components/images/imagesController.js"></script>
     <script src="app/components/sidebar/sidebarController.js"></script>
+    <script src="app/components/settings/settingsController.js"></script>
     <script src="app/viewmodel.js"></script>
 
     <!-- Fav and touch icons -->