diff --git a/src/common/engine/i_interface.cpp b/src/common/engine/i_interface.cpp
index 580dde407..7030194ea 100644
--- a/src/common/engine/i_interface.cpp
+++ b/src/common/engine/i_interface.cpp
@@ -4,6 +4,7 @@
 #include "startupinfo.h"
 #include "c_cvars.h"
 #include "gstrings.h"
+#include "version.h"
 
 static_assert(sizeof(void*) == 8, "32 builds are not supported");
 
@@ -23,7 +24,7 @@ bool			pauseext;
 
 FStartupInfo GameStartupInfo;
 
-CVAR(Bool, queryiwad, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
+CVAR(Bool, queryiwad, QUERYIWADDEFAULT, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
 CVAR(String, defaultiwad, "", CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
 CVAR(Bool, vid_fps, false, 0)
 
diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp
index f1495febc..99f5df02f 100644
--- a/src/d_iwad.cpp
+++ b/src/d_iwad.cpp
@@ -728,7 +728,7 @@ 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() > 1)
+	if (picks.Size() > 0)
 	{
 		// Locate the user's prefered IWAD, if it was found.
 		if (defaultiwad[0] != '\0')
@@ -743,7 +743,7 @@ int FIWadManager::IdentifyVersion (std::vector<std::string>&wadfiles, const char
 				}
 			}
 		}
-		if (picks.Size() > 1)
+		if (picks.Size() > 0)
 		{
 			if (!havepicked)
 			{
diff --git a/src/version.h b/src/version.h
index 1d02a1f40..21d2247e6 100644
--- a/src/version.h
+++ b/src/version.h
@@ -101,8 +101,11 @@ const char *GetVersionString();
 #define GAMENAME "GZDoom"
 #define WGAMENAME L"GZDoom"
 #define GAMENAMELOWERCASE "gzdoom"
+#define QUERYIWADDEFAULT true
 #define FORUM_URL "http://forum.zdoom.org/"
 #define BUGS_FORUM_URL	"http://forum.zdoom.org/viewforum.php?f=2"
+// For QUERYIWADDEFAULT: Set to 'true' to always show dialog box on startup by default, 'false' to disable.
+// Should set to 'false' for standalone games, and set to 'true' for regular source port forks that are meant to run any game.
 
 #if defined(__APPLE__) || defined(_WIN32)
 #define GAME_DIR GAMENAME