diff --git a/src/components/Dashboard/Modals/ChangePosition/ChangePositionModal.tsx b/src/components/Dashboard/Modals/ChangePosition/ChangePositionModal.tsx
index 633a44af6..7c6aec0c4 100644
--- a/src/components/Dashboard/Modals/ChangePosition/ChangePositionModal.tsx
+++ b/src/components/Dashboard/Modals/ChangePosition/ChangePositionModal.tsx
@@ -33,6 +33,8 @@ export const ChangePositionModal = ({
       ...previous,
       services: [...previous.services.filter((x) => x.id === tileAsService.id), tileAsService],
     }));
+
+    closeModal(id);
   };
 
   return (
diff --git a/src/components/layout/header/Actions/RunToolAction/ToolsMenu.tsx b/src/components/layout/header/Actions/RunToolAction/ToolsMenu.tsx
deleted file mode 100644
index 0fadda1f9..000000000
--- a/src/components/layout/header/Actions/RunToolAction/ToolsMenu.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { ActionIcon, Menu, Text } from '@mantine/core';
-import { IconAxe } from '@tabler/icons';
-import { useTranslation } from 'next-i18next';
-import DockerMenuButton from '../../../../../modules/docker/DockerModule';
-
-export const ToolsMenu = () => {
-  const { t } = useTranslation('layout/tools');
-  return (
-    <Menu>
-      <Menu.Target>
-        <ActionIcon variant="default" radius="md" size="xl" color="blue">
-          <IconAxe />
-        </ActionIcon>
-      </Menu.Target>
-      <Menu.Dropdown>
-        {/* TODO: Implement check to display fallback when no tools */}
-        <DockerMenuButton />
-        <Menu.Item closeMenuOnClick={false} disabled>
-          <Text size="sm" color="dimmed">
-            {t('fallback.title')}
-          </Text>
-        </Menu.Item>
-      </Menu.Dropdown>
-    </Menu>
-  );
-};
diff --git a/src/components/layout/header/Header.tsx b/src/components/layout/header/Header.tsx
index 80f5d7ea7..96acb610e 100644
--- a/src/components/layout/header/Header.tsx
+++ b/src/components/layout/header/Header.tsx
@@ -5,7 +5,6 @@ import { useConfigContext } from '../../../config/provider';
 import { Logo } from '../Logo';
 import { useCardStyles } from '../useCardStyles';
 import { AddElementAction } from './Actions/AddElementAction/AddElementAction';
-import { ToolsMenu } from './Actions/RunToolAction/ToolsMenu';
 import { Search } from './Search';
 import { SettingsMenu } from './SettingsMenu';
 
@@ -26,7 +25,6 @@ export function Header(props: any) {
         <Group position="right" noWrap>
           <Search />
           <AddElementAction />
-          <ToolsMenu />
 
           <ActionIcon
             onClick={() => {