diff --git a/app/soapbox/components/dropdown-menu/dropdown-menu-item.tsx b/app/soapbox/components/dropdown-menu/dropdown-menu-item.tsx
index 08339fe17..3de906dc8 100644
--- a/app/soapbox/components/dropdown-menu/dropdown-menu-item.tsx
+++ b/app/soapbox/components/dropdown-menu/dropdown-menu-item.tsx
@@ -64,7 +64,7 @@ const DropdownMenuItem = ({ index, item, onClick }: IDropdownMenuItem) => {
     const firstItem = index === 0;
 
     if (itemRef.current && firstItem) {
-      itemRef.current.focus();
+      itemRef.current.focus({ preventScroll: true });
     }
   }, [itemRef.current, index]);
 
diff --git a/app/soapbox/components/dropdown-menu/dropdown-menu.tsx b/app/soapbox/components/dropdown-menu/dropdown-menu.tsx
index 033580d10..4d81e0dca 100644
--- a/app/soapbox/components/dropdown-menu/dropdown-menu.tsx
+++ b/app/soapbox/components/dropdown-menu/dropdown-menu.tsx
@@ -211,6 +211,11 @@ const DropdownMenu = (props: IDropdownMenu) => {
     }
   };
 
+  useEffect(() => {
+    return () => {
+      dispatch(closeDropdownMenu());
+    };
+  }, []);
 
   useEffect(() => {
     document.addEventListener('click', handleDocumentClick, false);