diff --git a/src/UI/UserInterface.cpp b/src/UI/UserInterface.cpp
index ff92520c..1cd6ddde 100755
--- a/src/UI/UserInterface.cpp
+++ b/src/UI/UserInterface.cpp
@@ -3310,10 +3310,10 @@ namespace UI
 	{
 		if (filesNotMacros && text)
 		{
-			mgr.Show(fileListPopupNoFiles, false);
+			fileListPopupNoFiles->Show(false);
 		}
 
-		if (text && buttonIndex < ((filesNotMacros) ? NumDisplayedFiles : NumDisplayedMacros))
+		if (buttonIndex < ((filesNotMacros) ? NumDisplayedFiles : NumDisplayedMacros))
 		{
 			TextButton * const f = ((filesNotMacros) ? filenameButtons : macroButtons)[buttonIndex];
 			f->SetText(text);