diff --git a/ui/command_tab_view.cpp b/ui/command_tab_view.cpp
index c06084894..32e506c2f 100644
--- a/ui/command_tab_view.cpp
+++ b/ui/command_tab_view.cpp
@@ -147,6 +147,7 @@ void CommandTabView::OnSearchBarVisibilityChange(bool isHidden)
     if (isHidden)
     {
         m_search_bar->clearSearch();
+        m_search_bar->hide();
         m_search_trigger_button->show();
         DisconnectSearchBar();
     }
diff --git a/ui/main_window.cpp b/ui/main_window.cpp
index 0690c366b..c88db7b6f 100644
--- a/ui/main_window.cpp
+++ b/ui/main_window.cpp
@@ -1012,6 +1012,8 @@ void MainWindow::CreateShortcuts()
         m_event_search_bar->clearSearch();
         m_event_search_bar->hide();
         m_search_trigger_button->show();
+
+        DisconnectSearchBar();
     });
 
     // Overview Shortcut
@@ -1178,6 +1180,7 @@ void MainWindow::OnCommandBufferSearchBarVisibilityChange(bool isHidden)
     if (isHidden)
     {
         m_event_search_bar->clearSearch();
+        m_event_search_bar->hide();
         m_search_trigger_button->show();
 
         DisconnectSearchBar();
@@ -1195,6 +1198,11 @@ void MainWindow::OnTabViewChange()
         m_event_search_bar->clearSearch();
         m_event_search_bar->hide();
         m_search_trigger_button->show();
+        DisconnectSearchBar();
+    }
+    else if (currentIndex != m_command_view_tab_index)
+    {
+        m_command_tab_view->OnSearchBarVisibilityChange(true);
     }
 }