diff --git a/e2e-tests/cypress/e2e/browse-data.cy.js b/e2e-tests/cypress/e2e/browse-data.cy.js
index 9a24e88eb..8bcacec7d 100644
--- a/e2e-tests/cypress/e2e/browse-data.cy.js
+++ b/e2e-tests/cypress/e2e/browse-data.cy.js
@@ -433,7 +433,10 @@ describe('Data browser data', () => {
     cy.contains('Album').click();
     cy.testid('DataFilterControl_input_ArtistId').type('22{enter}');
     // cy.contains('Presence').rightclick();
+    // cy.contains('Coda').rightclick();
+    // cy.testid('DropDownMenu-container-0').contains('Export').click();
     cy.contains('Export').click();
+    // cy.wait(1000);
     cy.themeshot('data-browser-export-menu');
   });
 
diff --git a/e2e-tests/screenshots/dummy.txt b/e2e-tests/screenshots/dummy.txt
deleted file mode 100644
index 59633d601..000000000
--- a/e2e-tests/screenshots/dummy.txt
+++ /dev/null
@@ -1 +0,0 @@
-Folder with screenshots
\ No newline at end of file
diff --git a/packages/web/src/buttons/ToolStripDropDownButton.svelte b/packages/web/src/buttons/ToolStripDropDownButton.svelte
index 5a06ab9ab..b84536163 100644
--- a/packages/web/src/buttons/ToolStripDropDownButton.svelte
+++ b/packages/web/src/buttons/ToolStripDropDownButton.svelte
@@ -14,8 +14,9 @@
   function handleClick(e) {
     const rect = e.detail.target.getBoundingClientRect();
     const left = rect.left;
-    const top = rect.bottom;
-    currentDropDownMenu.set({ left, top, items: menu });
+    const top = rect.top;
+    // const top = rect.bottom;
+    currentDropDownMenu.set({ left, bottom: window.innerHeight - top, items: menu });
   }
 </script>
 
diff --git a/packages/web/src/modals/CurrentDropDownMenu.svelte b/packages/web/src/modals/CurrentDropDownMenu.svelte
index 320285ca7..327045e93 100644
--- a/packages/web/src/modals/CurrentDropDownMenu.svelte
+++ b/packages/web/src/modals/CurrentDropDownMenu.svelte
@@ -8,6 +8,7 @@
   <DropDownMenu
     left={$currentDropDownMenu.left}
     top={$currentDropDownMenu.top}
+    bottom={$currentDropDownMenu.bottom}
     items={$currentDropDownMenu.items}
     targetElement={$currentDropDownMenu.targetElement}
     on:close={() => ($currentDropDownMenu = null)}
diff --git a/packages/web/src/modals/DropDownMenu.svelte b/packages/web/src/modals/DropDownMenu.svelte
index f5ac0c323..05f7ddcf4 100644
--- a/packages/web/src/modals/DropDownMenu.svelte
+++ b/packages/web/src/modals/DropDownMenu.svelte
@@ -7,29 +7,6 @@
     if (side == 'right') return { top: top, left: left + box.width };
     return { top: top, left: left };
   }
-
-  function fixPopupPlacement(element) {
-    const { width, height } = element.getBoundingClientRect();
-    let offset = getElementOffset(element);
-
-    let newLeft = null;
-    let newTop = null;
-
-    if (offset.left + width > window.innerWidth) {
-      newLeft = offset.left - width;
-
-      if (newLeft < 0) newLeft = 0;
-    }
-
-    if (offset.top + height > window.innerHeight) {
-      newTop = offset.top - height;
-
-      if (newTop < 0) newTop = 0;
-    }
-
-    if (newLeft != null) element.style.left = `${newLeft}px`;
-    if (newTop != null) element.style.top = `${newTop}px`;
-  }
 </script>
 
 <script>
@@ -43,12 +20,17 @@
 
   export let items;
   export let top;
+  export let bottom;
   export let left;
   export let onCloseParent;
   export let targetElement;
+  export let submenuLevel = 0;
 
   let element;
 
+  let newLeft = undefined;
+  let newTop = undefined;
+
   let hoverItem;
   let hoverOffset;
 
@@ -57,6 +39,8 @@
 
   let switchIndex = 0;
 
+  let submenuKey = 0;
+
   const dispatch = createEventDispatcher();
   let closeHandlers = [];
 
@@ -68,6 +52,25 @@
     closeHandlers = [];
   }
 
+  function fixPopupPlacement(element) {
+    const { width, height } = element.getBoundingClientRect();
+    let offset = getElementOffset(element);
+
+    if (offset.left + width > window.innerWidth) {
+      newLeft = offset.left - width;
+
+      if (newLeft < 0) newLeft = 0;
+    }
+
+    if (offset.top < 0) {
+      newTop = 0;
+    } else if (offset.top + height > window.innerHeight) {
+      newTop = offset.top - height;
+
+      if (newTop < 0) newTop = 0;
+    }
+  }
+
   function registerCloseHandler(handler) {
     closeHandlers.push(handler);
   }
@@ -80,6 +83,7 @@
 
       submenuItem = item;
       submenuOffset = hoverOffset;
+      submenuKey += 1;
       return;
     }
     if (item.switchStore && item.switchValue) {
@@ -109,6 +113,7 @@
   const changeActiveSubmenu = _.throttle(() => {
     submenuItem = hoverItem;
     submenuOffset = hoverOffset;
+    submenuKey += 1;
   }, 500);
 
   $: preparedItems = prepareMenuItems(items, { targetElement, registerCloseHandler }, $commandsCustomized);
@@ -128,7 +133,14 @@
   });
 </script>
 
-<ul class="dropDownMenuMarker" style={`left: ${left}px; top: ${top}px`} bind:this={element}>
+<ul
+  class="dropDownMenuMarker"
+  style:top={(newTop ?? top) != null ? `${newTop ?? top}px` : undefined}
+  style:bottom={newTop == null && bottom != null ? `${bottom}px` : undefined}
+  style:left={(newLeft ?? left) != null ? `${newLeft ?? left}px` : undefined}
+  bind:this={element}
+  data-testid={`DropDownMenu-container-${submenuLevel}`}
+>
   {#each preparedItems as item}
     {#if item.divider}
       <li class="divider" />
@@ -172,14 +184,17 @@
   {/each}
 </ul>
 {#if submenuItem?.submenu}
-  <svelte:self
-    items={submenuItem?.submenu}
-    {...submenuOffset}
-    onCloseParent={() => {
-      if (onCloseParent) onCloseParent();
-      dispatchClose();
-    }}
-  />
+  {#key submenuKey}
+    <svelte:self
+      items={submenuItem?.submenu}
+      {...submenuOffset}
+      onCloseParent={() => {
+        if (onCloseParent) onCloseParent();
+        dispatchClose();
+      }}
+      submenuLevel={submenuLevel + 1}
+    />
+  {/key}
 {/if}
 
 <style>