diff --git a/mapchooser_extended/scripting/nominations_extended.sp b/mapchooser_extended/scripting/nominations_extended.sp
index 79af3703..29f1a247 100644
--- a/mapchooser_extended/scripting/nominations_extended.sp
+++ b/mapchooser_extended/scripting/nominations_extended.sp
@@ -603,6 +603,18 @@ Menu BuildAdminMapMenu(const char[] filter)
 			AddMenuItem(menu, map, map);
 	}
 
+	if(filter[0])
+	{
+		// Search normal maps aswell if filter is specified
+		for(int i = 0; i < GetArraySize(g_MapList); i++)
+		{
+			GetArrayString(g_MapList, i, map, sizeof(map));
+
+			if(!filter[0] || StrContains(map, filter, false) != -1)
+				AddMenuItem(menu, map, map);
+		}
+	}
+
 	SetMenuExitButton(menu, true);
 
 	return menu;