diff --git a/Source/Project64/UserInterface/MainMenu.cpp b/Source/Project64/UserInterface/MainMenu.cpp
index 0cee54773..dfaae0a83 100644
--- a/Source/Project64/UserInterface/MainMenu.cpp
+++ b/Source/Project64/UserInterface/MainMenu.cpp
@@ -304,6 +304,15 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
         {
             g_BaseSystem->StartEmulation(true);
         }
+		else if (g_Settings->LoadBool(Setting_AutoStart) == 0)
+		{
+			WriteTrace(TraceN64System, TraceDebug, "Manually starting rom");
+			CN64System::RunLoadedImage();
+			if (g_BaseSystem == NULL) 
+			{
+				g_Notify->BreakPoint(__FILE__, __LINE__);
+			}
+		}
         else
         {
             g_Notify->BreakPoint(__FILE__, __LINE__);