diff --git a/app/components/container/container.html b/app/components/container/container.html
index f3f19fa93..f640b0cd6 100644
--- a/app/components/container/container.html
+++ b/app/components/container/container.html
@@ -21,7 +21,10 @@
             <button class="btn btn-danger btn-responsive" ng-click="confirmRemove()"><i class="fa fa-trash space-right" aria-hidden="true"></i>Remove</button>
           </div>
           <div class="btn-group" role="group" aria-label="...">
-            <button class="btn btn-danger btn-responsive" ng-click="recreate()" ng-if="!container.Config.Labels['com.docker.swarm.service.id']"><i class="fa fa-refresh space-right" aria-hidden="true"></i>Recreate</button>
+            <button type="button" class="btn btn-danger btn-responsive" ng-disabled="state.recreateContainerInProgress" ng-click="recreate()" button-spinner="state.recreateContainerInProgress" ng-if="!container.Config.Labels['com.docker.swarm.service.id']">
+              <span ng-hide="state.recreateContainerInProgress"><i class="fa fa-refresh space-right" aria-hidden="true"></i>Recreate</span>
+              <span ng-show="state.recreateContainerInProgress">Recreation in progress...</span>
+            </button>
             <button class="btn btn-primary btn-responsive" ng-click="duplicate()" ng-if="!container.Config.Labels['com.docker.swarm.service.id']"><i class="fa fa-files-o space-right" aria-hidden="true"></i>Duplicate/Edit</button>
           </div>
         </rd-widget-body>
diff --git a/app/components/container/containerController.js b/app/components/container/containerController.js
index c75f6894a..767028df7 100644
--- a/app/components/container/containerController.js
+++ b/app/components/container/containerController.js
@@ -8,6 +8,7 @@ function ($q, $scope, $state, $transition$, $filter, Container, ContainerCommit,
     Registry: ''
   };
   $scope.state = {
+    recreateContainerInProgress: false,
     joinNetworkInProgress: false,
     leaveNetworkInProgress: false,
     pagination_count: Pagination.getPaginationCount('container_networks')
@@ -207,6 +208,7 @@ function ($q, $scope, $state, $transition$, $filter, Container, ContainerCommit,
   function recreateContainer(pullImage) {
     var container = $scope.container;
     var config = ContainerHelper.configFromContainer(container.Model);
+    $scope.state.recreateContainerInProgress = true;
     ContainerService.remove(container, true)
     .then(function success() {
       return RegistryService.retrieveRegistryFromRepository(container.Config.Image);
@@ -239,6 +241,7 @@ function ($q, $scope, $state, $transition$, $filter, Container, ContainerCommit,
     })
     .catch(function error(err) {
       Notifications.error('Failure', err, 'Unable to re-create container');
+      $scope.state.recreateContainerInProgress = false;
     });
   }