diff --git a/pkg/gui/filtering_menu_panel.go b/pkg/gui/filtering_menu_panel.go
index 935b58af1..649172b45 100644
--- a/pkg/gui/filtering_menu_panel.go
+++ b/pkg/gui/filtering_menu_panel.go
@@ -6,18 +6,14 @@ import (
 )
 
 func (gui *Gui) handleCreateFilteringMenuPanel() error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
 	fileName := ""
-	switch gui.currentViewName() {
-	case "files":
+	switch gui.currentSideListContext() {
+	case gui.State.Contexts.Files:
 		node := gui.getSelectedFileNode()
 		if node != nil {
 			fileName = node.GetPath()
 		}
-	case "commitFiles":
+	case gui.State.Contexts.CommitFiles:
 		node := gui.getSelectedCommitFileNode()
 		if node != nil {
 			fileName = node.GetPath()