diff --git a/app/docker/views/containers/create/createContainerController.js b/app/docker/views/containers/create/createContainerController.js
index 6580485f9..c03862d44 100644
--- a/app/docker/views/containers/create/createContainerController.js
+++ b/app/docker/views/containers/create/createContainerController.js
@@ -282,7 +282,7 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai
     return config;
   }
 
-  
+
   function loadFromContainerCmd(d) {
     if ($scope.config.Cmd) {
       $scope.config.Cmd = ContainerHelper.commandArrayToString($scope.config.Cmd);
@@ -374,7 +374,7 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai
     } else {
       $scope.formValues.MacAddress = '';
     }
-    
+
     // ExtraHosts
     if ($scope.config.HostConfig.ExtraHosts) {
       var extraHosts = $scope.config.HostConfig.ExtraHosts;
@@ -594,7 +594,7 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai
   function create() {
     var oldContainer = null;
 
-    
+
     HttpRequestHelper.setPortainerAgentTargetHeader($scope.formValues.NodeName);
     return findCurrentContainer()
       .then(confirmCreateContainer)
@@ -631,8 +631,8 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai
         return $q.when();
       }
       $scope.state.actionInProgress = true;
-      return stopAndRenameContainer(oldContainer)
-        .then(pullImageIfNeeded)
+      return pullImageIfNeeded()
+        .then(stopAndRenameContainer(oldContainer))
         .then(createNewContainer)
         .then(applyResourceControl)
         .then(connectToExtraNetworks)
diff --git a/app/docker/views/containers/edit/containerController.js b/app/docker/views/containers/edit/containerController.js
index e2c017632..0efe59f1e 100644
--- a/app/docker/views/containers/edit/containerController.js
+++ b/app/docker/views/containers/edit/containerController.js
@@ -196,9 +196,9 @@ function ($q, $scope, $state, $transition$, $filter, Commit, ContainerHelper, Co
     $scope.state.recreateContainerInProgress = true;
     var isRunning = container.State.Running;
 
-    return stopContainerIfNeeded()
+    return pullImageIfNeeded()
+      .then(stopContainerIfNeeded)
       .then(renameContainer)
-      .then(pullImageIfNeeded)
       .then(setMainNetworkAndCreateContainer)
       .then(connectContainerToOtherNetworks)
       .then(startContainerIfNeeded)
@@ -312,7 +312,7 @@ function ($q, $scope, $state, $transition$, $filter, Commit, ContainerHelper, Co
 
   function updateRestartPolicy(restartPolicy, maximumRetryCount) {
     maximumRetryCount = restartPolicy === 'on-failure' ? maximumRetryCount : undefined;
-    
+
     return ContainerService
       .updateRestartPolicy($scope.container.Id, restartPolicy, maximumRetryCount)
       .then(onUpdateSuccess)