diff --git a/app/portainer/access-control/AccessControlPanel/AccessControlPanel.tsx b/app/portainer/access-control/AccessControlPanel/AccessControlPanel.tsx
index ee4a0d763..9e43e3de9 100644
--- a/app/portainer/access-control/AccessControlPanel/AccessControlPanel.tsx
+++ b/app/portainer/access-control/AccessControlPanel/AccessControlPanel.tsx
@@ -6,7 +6,7 @@ import { r2a } from '@/react-tools/react2angular';
 import { TeamMembership, Role } from '@/portainer/teams/types';
 import { useUserMembership } from '@/portainer/users/queries';
 
-import { Table, TableContainer, TableTitle } from '@@/datatables';
+import { TableContainer, TableTitle } from '@@/datatables';
 import { Button } from '@@/buttons';
 
 import { ResourceControlType, ResourceId } from '../types';
@@ -48,33 +48,31 @@ export function AccessControlPanel({
       <div className="col-sm-12">
         <TableContainer>
           <TableTitle label="Access control" icon="eye" featherIcon />
-          <Table className="no-padding">
-            <AccessControlPanelDetails
-              resourceType={resourceType}
+          <AccessControlPanelDetails
+            resourceType={resourceType}
+            resourceControl={resourceControl}
+          />
+
+          {!isEditDisabled && !isEditMode && (
+            <div className="row">
+              <div>
+                <Button color="link" onClick={toggleEditMode}>
+                  <Icon icon="edit" className="space-right" feather />
+                  Change ownership
+                </Button>
+              </div>
+            </div>
+          )}
+
+          {isEditMode && (
+            <AccessControlPanelForm
               resourceControl={resourceControl}
+              onCancelClick={() => toggleEditMode()}
+              resourceId={resourceId}
+              resourceType={resourceType}
+              onUpdateSuccess={handleUpdateSuccess}
             />
-
-            {!isEditDisabled && !isEditMode && (
-              <div className="row">
-                <div>
-                  <Button color="link" onClick={toggleEditMode}>
-                    <Icon icon="edit" className="space-right" feather />
-                    Change ownership
-                  </Button>
-                </div>
-              </div>
-            )}
-
-            {isEditMode && (
-              <AccessControlPanelForm
-                resourceControl={resourceControl}
-                onCancelClick={() => toggleEditMode()}
-                resourceId={resourceId}
-                resourceType={resourceType}
-                onUpdateSuccess={handleUpdateSuccess}
-              />
-            )}
-          </Table>
+          )}
         </TableContainer>
       </div>
     </div>
diff --git a/app/portainer/views/stacks/edit/stackController.js b/app/portainer/views/stacks/edit/stackController.js
index a8bd60368..4bb08a802 100644
--- a/app/portainer/views/stacks/edit/stackController.js
+++ b/app/portainer/views/stacks/edit/stackController.js
@@ -316,7 +316,7 @@ angular.module('portainer.app').controller('StackController', [
     }
 
     function loadStack(id) {
-      return $async(() => {
+      return $async(async () => {
         var agentProxy = $scope.applicationState.endpoint.mode.agentProxy;
 
         getEnvironments()