diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index ad3d48ee9..bd80166a6 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -5953,7 +5953,7 @@ DOKEYDOWN:
 			}
 			return 0;
 	}
-  return DefWindowProc (hwnd, message, wParam, lParam);
+	return DefWindowProc (hwnd, message, wParam, lParam);
 }
 
 void Change3DCoreWithFallbackAndSave(int newCore)
@@ -5966,6 +5966,12 @@ void Change3DCoreWithFallbackAndSave(int newCore)
 	if(newCore == GPU3D_SWRAST)
 		goto TRY_SWRAST;
 
+	if(newCore == GPU3D_NULL)
+	{
+		NDS_3D_ChangeCore(GPU3D_NULL);
+		goto DONE;
+	}
+
 	if(!NDS_3D_ChangeCore(GPU3D_OPENGL_3_2))
 	{
 		printf("falling back to 3d core: %s\n",core3DList[GPU3D_OPENGL_OLD]->name);