diff --git a/app/portainer/views/stacks/create/createStackController.js b/app/portainer/views/stacks/create/createStackController.js
index 07cea305b..e393df30f 100644
--- a/app/portainer/views/stacks/create/createStackController.js
+++ b/app/portainer/views/stacks/create/createStackController.js
@@ -232,8 +232,8 @@ angular
       }
 
       try {
-        $scope.containers = await ContainerService.containers();
-        $scope.containerNames = ContainerHelper.getContainerNames($scope.containers);
+        const containers = await ContainerService.containers(true);
+        $scope.containerNames = ContainerHelper.getContainerNames(containers);
       } catch (err) {
         Notifications.error('Failure', err, 'Unable to retrieve Containers');
       }
diff --git a/app/portainer/views/stacks/edit/stackController.js b/app/portainer/views/stacks/edit/stackController.js
index 9239f7644..dbc347c43 100644
--- a/app/portainer/views/stacks/edit/stackController.js
+++ b/app/portainer/views/stacks/edit/stackController.js
@@ -291,7 +291,7 @@ angular.module('portainer.app').controller('StackController', [
       $q.all({
         stack: StackService.stack(id),
         groups: GroupService.groups(),
-        containers: ContainerService.containers(),
+        containers: ContainerService.containers(true),
       })
         .then(function success(data) {
           var stack = data.stack;