diff --git a/src/source.cc b/src/source.cc
index ff3ecc6..1afe104 100644
--- a/src/source.cc
+++ b/src/source.cc
@@ -428,6 +428,14 @@ void Source::View::set_tooltip_and_dialog_events() {
       }, 500);
       type_tooltips.hide();
       diagnostic_tooltips.hide();
+      
+      if(spellcheck_suggestions_dialog && spellcheck_suggestions_dialog->shown)
+        spellcheck_suggestions_dialog->hide();
+      if(autocomplete_dialog && autocomplete_dialog->shown)
+        autocomplete_dialog->hide();
+      if(selection_dialog && selection_dialog->shown)
+        selection_dialog->hide();
+      
       set_info(info);
     }
   });
diff --git a/src/window.cc b/src/window.cc
index ef955b9..aef42c8 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -592,7 +592,7 @@ void Window::set_menu_actions() {
         });
       }
       entry_box.hide();
-    });
+    }, 30);
     auto entry_it=entry_box.entries.begin();
     entry_it->set_placeholder_text("Command");
     entry_box.buttons.emplace_back("Run command", [this, entry_it](){