1 files changed, 5 insertions, 0 deletions
diff --git a/src/context.cc b/src/context.cc
index a79f7790..5e16682d 100644
--- a/src/context.cc
+++ b/src/context.cc
@@ -150,9 +150,14 @@ void Context::change_buffer(Buffer& buffer)
 
     m_window.reset();
     if (has_client())
+    {
         client().change_buffer(buffer);
+        client().info_hide();
+        client().menu_hide();
+    }
     else
         m_selections = SelectionList{buffer, Selection{}};
+
     if (has_input_handler())
         input_handler().reset_normal_mode();
 }