diff --git a/src/components/Editor/Editor.tsx b/src/components/Editor/Editor.tsx
index ffc9e09e..101f9af2 100644
--- a/src/components/Editor/Editor.tsx
+++ b/src/components/Editor/Editor.tsx
@@ -260,7 +260,7 @@ export const Editor = (props: Props) => {
               !e.isActive('image') &&
               !e.isActive('figure')) ||
             e.isActive('footnote') ||
-            e.isActive('figcaption')
+            (e.isActive('figcaption') && !empty)
           setShouldShowTextBubbleMenu(result)
           return result
         },
diff --git a/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx b/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx
index a348a430..673da091 100644
--- a/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx
+++ b/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx
@@ -93,6 +93,7 @@ export const EditorFloatingMenu = (props: FloatingMenuProps) => {
   const closeUploadModalHandler = () => {
     setSelectedMenuItem()
     setMenuOpen(false)
+    setSelectedMenuItem()
   }
 
   useOutsideClickHandler({
@@ -104,6 +105,7 @@ export const EditorFloatingMenu = (props: FloatingMenuProps) => {
 
       if (menuOpen()) {
         setMenuOpen(false)
+        setSelectedMenuItem()
       }
     },
   })
diff --git a/src/components/Editor/TextBubbleMenu/TextBubbleMenu.tsx b/src/components/Editor/TextBubbleMenu/TextBubbleMenu.tsx
index d30c5cb6..c7bb2d32 100644
--- a/src/components/Editor/TextBubbleMenu/TextBubbleMenu.tsx
+++ b/src/components/Editor/TextBubbleMenu/TextBubbleMenu.tsx
@@ -39,6 +39,9 @@ export const TextBubbleMenu = (props: BubbleMenuProps) => {
     if (!props.shouldShow) {
       setFootNote()
       setFootnoteEditorOpen(false)
+      setLinkEditorOpen(false)
+      setTextSizeBubbleOpen(false)
+      setListBubbleOpen(false)
     }
   })
 
@@ -93,11 +96,13 @@ export const TextBubbleMenu = (props: BubbleMenuProps) => {
       props.editor.chain().focus().setFootnote({ value: footnote }).run()
     }
     setFootNote()
+    setLinkEditorOpen(false)
     setFootnoteEditorOpen(false)
   }
 
   const handleOpenFootnoteEditor = () => {
     updateCurrentFootnoteValue()
+    setLinkEditorOpen(false)
     setFootnoteEditorOpen(true)
   }
 
@@ -120,6 +125,7 @@ export const TextBubbleMenu = (props: BubbleMenuProps) => {
     window.addEventListener('keydown', handleKeyDown)
     onCleanup(() => {
       window.removeEventListener('keydown', handleKeyDown)
+      setLinkEditorOpen(false)
     })
   })