diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp
index 99f5df02f..0dd46db3b 100644
--- a/src/d_iwad.cpp
+++ b/src/d_iwad.cpp
@@ -727,8 +727,10 @@ int FIWadManager::IdentifyVersion (std::vector<std::string>&wadfiles, const char
 	}
 	int pick = 0;
 
-	// We got more than one so present the IWAD selection box.
-	if (picks.Size() > 0)
+	// Present the IWAD selection box.
+	bool alwaysshow = (queryiwad && !Args->CheckParm("-iwad"));
+
+	if (alwaysshow || picks.Size() > 1)
 	{
 		// Locate the user's prefered IWAD, if it was found.
 		if (defaultiwad[0] != '\0')
@@ -743,7 +745,7 @@ int FIWadManager::IdentifyVersion (std::vector<std::string>&wadfiles, const char
 				}
 			}
 		}
-		if (picks.Size() > 0)
+		if (alwaysshow || picks.Size() > 1)
 		{
 			if (!havepicked)
 			{