diff --git a/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx b/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx
index cd903404..23f916b9 100644
--- a/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx
+++ b/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx
@@ -52,14 +52,7 @@ export const EditorFloatingMenu = (props: FloatingMenuProps) => {
   return (
     <>
       <div ref={props.ref} class={styles.editorFloatingMenu}>
-        <button
-          type="button"
-          onClick={() => {
-            console.log('!!! selectedMenuItem:', selectedMenuItem())
-
-            setMenuOpen(!menuOpen())
-          }}
-        >
+        <button type="button" onClick={() => setMenuOpen(!menuOpen())}>
           <Icon name="editor-plus" />
         </button>
         <Show when={menuOpen()}>
@@ -82,7 +75,7 @@ export const EditorFloatingMenu = (props: FloatingMenuProps) => {
         </Show>
       </div>
       <Modal variant="narrow" name="uploadImage" onClose={closeUploadModalHandler}>
-        <UploadModalContent editor={props.editor} />
+        <UploadModalContent closeCallback={() => setSelectedMenuItem(null)} editor={props.editor} />
       </Modal>
     </>
   )
diff --git a/src/components/Editor/UploadModal/UploadModalContent.tsx b/src/components/Editor/UploadModal/UploadModalContent.tsx
index e5a8c204..597d6ebc 100644
--- a/src/components/Editor/UploadModal/UploadModalContent.tsx
+++ b/src/components/Editor/UploadModal/UploadModalContent.tsx
@@ -14,6 +14,7 @@ import { verifyImg } from '../../../utils/verifyImg'
 
 type Props = {
   editor: Editor
+  closeCallback: () => void
 }
 
 export const UploadModalContent = (props: Props) => {
@@ -103,6 +104,7 @@ export const UploadModalContent = (props: Props) => {
               showInput={true}
               onClose={() => {
                 hideModal()
+                props.closeCallback()
               }}
               validate={(value) => verifyImg(value)}
               onSubmit={handleImageFormSubmit}