diff --git a/trunk/desmume/src/windows/ginfo.c b/trunk/desmume/src/windows/ginfo.c
index e548e3830..d725bbbfe 100644
--- a/trunk/desmume/src/windows/ginfo.c
+++ b/trunk/desmume/src/windows/ginfo.c
@@ -57,6 +57,8 @@ LRESULT Ginfo_OnPaint(HWND hwnd, WPARAM wParam, LPARAM lParam)
         
         EndPaint(hwnd, &ps);
 
+        free(header);
+
         return 0;
 }
 
diff --git a/trunk/desmume/src/windows/main.c b/trunk/desmume/src/windows/main.c
index b27aa9a0e..2ffbf7969 100644
--- a/trunk/desmume/src/windows/main.c
+++ b/trunk/desmume/src/windows/main.c
@@ -72,6 +72,7 @@ u32 glock = 0;
 BOOL click = FALSE;
 
 BOOL finished = FALSE;
+BOOL romloaded = FALSE;
 
 HMENU menu;
 HANDLE runthread=INVALID_HANDLE_VALUE;
@@ -313,12 +314,17 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
     {
        EnableMenuItem(menu, IDM_EXEC, MF_GRAYED);
        EnableMenuItem(menu, IDM_PAUSE, MF_ENABLED);
+       EnableMenuItem(menu, IDM_RESET, MF_ENABLED);
+       EnableMenuItem(menu, IDM_GAME_INFO, MF_ENABLED);
+       romloaded = TRUE;
        NDS_UnPause();
     }
     else
     {
        EnableMenuItem(menu, IDM_EXEC, MF_ENABLED);
        EnableMenuItem(menu, IDM_PAUSE, MF_GRAYED);
+       EnableMenuItem(menu, IDM_RESET, MF_GRAYED);
+       EnableMenuItem(menu, IDM_GAME_INFO, MF_GRAYED);
     }
 
     CheckMenuItem(menu, IDC_SAVETYPE1, MF_BYCOMMAND | MF_CHECKED);
@@ -417,6 +423,9 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
                   {
                      EnableMenuItem(menu, IDM_EXEC, MF_GRAYED);
                      EnableMenuItem(menu, IDM_PAUSE, MF_ENABLED);
+                     EnableMenuItem(menu, IDM_RESET, MF_ENABLED);
+                     EnableMenuItem(menu, IDM_GAME_INFO, MF_ENABLED);
+                     romloaded = TRUE;
                      NDS_UnPause();
                   }
              }
@@ -596,7 +605,8 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
                             
                             if(!GetOpenFileName(&ofn))
                             {
-                                 NDS_UnPause(); //Restart emulation if no new rom chosen
+                                 if (romloaded)
+                                    NDS_UnPause(); //Restart emulation if no new rom chosen
                                  return 0;
                             }
                             
@@ -606,6 +616,9 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
                             {
                                EnableMenuItem(menu, IDM_EXEC, MF_GRAYED);
                                EnableMenuItem(menu, IDM_PAUSE, MF_ENABLED);
+                               EnableMenuItem(menu, IDM_RESET, MF_ENABLED);
+                               EnableMenuItem(menu, IDM_GAME_INFO, MF_ENABLED);
+                               romloaded = TRUE;
                                NDS_UnPause();
                             }
                        }