diff --git a/app/app.js b/app/app.js
index 89d45788a..5f3eb366e 100644
--- a/app/app.js
+++ b/app/app.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('dockerui', ['ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer'])
+angular.module('dockerui', ['ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar'])
     .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'});
diff --git a/partials/sidebar.html b/app/components/sidebar/sidebar.html
similarity index 100%
rename from partials/sidebar.html
rename to app/components/sidebar/sidebar.html
diff --git a/app/components/sidebar/sidebarController.js b/app/components/sidebar/sidebarController.js
new file mode 100644
index 000000000..f182a3481
--- /dev/null
+++ b/app/components/sidebar/sidebarController.js
@@ -0,0 +1,11 @@
+angular.module('sidebar', [])
+.controller('SideBarController', ['$scope', 'Container', 'Settings',
+function($scope, Container, Settings) {
+    $scope.template = 'partials/sidebar.html';
+    $scope.containers = [];
+    $scope.endpoint = Settings.endpoint;
+
+    Container.query({all: 0}, function(d) {
+        $scope.containers = d;
+    });
+}]);
diff --git a/app/controllers.js b/app/controllers.js
index 4bfcb466b..e9cfd42bc 100644
--- a/app/controllers.js
+++ b/app/controllers.js
@@ -47,16 +47,6 @@ function getChart(id) {
     return new Chart(ctx);
 }
 
-function SideBarController($scope, Container, Settings) {
-    $scope.template = 'partials/sidebar.html';
-    $scope.containers = [];
-    $scope.endpoint = Settings.endpoint;
-
-    Container.query({all: 0}, function(d) {
-        $scope.containers = d;
-    });
-}
-
 function SettingsController($scope, System, Docker, Settings, Messages) {
     $scope.info = {};
     $scope.docker = {};
diff --git a/index.html b/index.html
index adac9bfbf..83c1ebf84 100644
--- a/index.html
+++ b/index.html
@@ -45,6 +45,7 @@
     <script src="app/components/startContainer/startContainerController.js"></script>
     <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/viewmodel.js"></script>
 
     <!-- Fav and touch icons -->