diff --git a/src/Vulkan/main.cpp b/src/Vulkan/main.cpp
index 80b6ee0..9a75f05 100644
--- a/src/Vulkan/main.cpp
+++ b/src/Vulkan/main.cpp
@@ -62,9 +62,17 @@
 	switch(reason)
 	{
 	case DLL_PROCESS_ATTACH:
-#ifdef DEBUGGER_WAIT_DIALOG
-		WaitForDebugger(instance);
-#endif
+		#ifdef DEBUGGER_WAIT_DIALOG
+		{
+			char disable_debugger_wait_dialog[] = "0";
+			GetEnvironmentVariable("SWIFTSHADER_DISABLE_DEBUGGER_WAIT_DIALOG", disable_debugger_wait_dialog, sizeof(disable_debugger_wait_dialog));
+
+			if(disable_debugger_wait_dialog[0] != '1')
+			{
+				WaitForDebugger(instance);
+			}
+		}
+		#endif
 		break;
 	case DLL_THREAD_ATTACH:
 	case DLL_THREAD_DETACH: