diff --git a/app/components/containers/containers.html b/app/components/containers/containers.html
index c7d86a426..7d1ecca69 100644
--- a/app/components/containers/containers.html
+++ b/app/components/containers/containers.html
@@ -85,7 +85,7 @@
           <tbody>
             <tr dir-paginate="container in (state.filteredContainers = ( containers | filter:state.filter | orderBy:sortType:sortReverse | itemsPerPage: pagination_count))">
               <td><input type="checkbox" ng-model="container.Checked" ng-change="selectItem(container)"/></td>
-              <td><span class="label label-{{ container.Status|containerstatusbadge }}">{{ container.Status|containerstatus }}</span></td>
+              <td><span class="label label-{{ container.Status|containerstatusbadge }}">{{ container.Status }}</span></td>
               <td ng-if="endpointMode.provider === 'DOCKER_SWARM'"><a ui-sref="container({id: container.Id})">{{ container|swarmcontainername}}</a></td>
               <td ng-if="endpointMode.provider !== 'DOCKER_SWARM'"><a ui-sref="container({id: container.Id})">{{ container|containername}}</a></td>
               <td><a ui-sref="image({id: container.Image})">{{ container.Image }}</a></td>
diff --git a/app/components/containers/containersController.js b/app/components/containers/containersController.js
index acaa912ed..e5d8ba98d 100644
--- a/app/components/containers/containersController.js
+++ b/app/components/containers/containersController.js
@@ -1,6 +1,6 @@
 angular.module('containers', [])
-.controller('ContainersController', ['$scope', 'Container', 'ContainerHelper', 'Info', 'Settings', 'Messages', 'Config',
-function ($scope, Container, ContainerHelper, Info, Settings, Messages, Config) {
+.controller('ContainersController', ['$scope', '$filter', 'Container', 'ContainerHelper', 'Info', 'Settings', 'Messages', 'Config',
+function ($scope, $filter, Container, ContainerHelper, Info, Settings, Messages, Config) {
   $scope.state = {};
   $scope.state.displayAll = Settings.displayAll;
   $scope.state.displayIP = false;
@@ -23,6 +23,8 @@ function ($scope, Container, ContainerHelper, Info, Settings, Messages, Config)
       }
       $scope.containers = containers.map(function (container) {
         var model = new ContainerViewModel(container);
+        model.Status = $filter('containerstatus')(model.Status);
+
         if (model.IP) {
           $scope.state.displayIP = true;
         }
diff --git a/app/shared/filters.js b/app/shared/filters.js
index 981626427..ce5b616c4 100644
--- a/app/shared/filters.js
+++ b/app/shared/filters.js
@@ -44,7 +44,7 @@ angular.module('portainer.filters', [])
       return 'warning';
     } else if (status.indexOf('created') !== -1) {
       return 'info';
-    } else if (status.indexOf('exited') !== -1) {
+    } else if (status.indexOf('stopped') !== -1) {
       return 'danger';
     }
     return 'success';
diff --git a/app/shared/viewmodel.js b/app/shared/viewmodel.js
index e320c0752..64f823670 100644
--- a/app/shared/viewmodel.js
+++ b/app/shared/viewmodel.js
@@ -53,6 +53,7 @@ function ServiceViewModel(data) {
 function ContainerViewModel(data) {
   this.Id = data.Id;
   this.Status = data.Status;
+  this.State = data.State;
   this.Names = data.Names;
   // Unavailable in Docker < 1.10
   if (data.NetworkSettings && !_.isEmpty(data.NetworkSettings.Networks)) {