diff --git a/bochs/gui/win32dialog.cc b/bochs/gui/win32dialog.cc
index 09680e125..f7135c2e7 100644
--- a/bochs/gui/win32dialog.cc
+++ b/bochs/gui/win32dialog.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: win32dialog.cc,v 1.42 2006-04-09 13:55:55 vruppert Exp $
+// $Id: win32dialog.cc,v 1.43 2006-05-28 08:49:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 
 #include "config.h"
@@ -760,10 +760,11 @@ static BOOL CALLBACK RTMiscDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP
               break;
             case IDSAVESTATE:
 #if BX_SUPPORT_SAVE_RESTORE
-              MessageBox(hDlg, "The save/restore function currently handles config and log options only", "WARNING", MB_ICONEXCLAMATION);
+              MessageBox(hDlg, "The save function quits after saving, since the state of hard drive images cannot be saved yet!", "WARNING", MB_ICONEXCLAMATION);
               sr_path[0] = 0;
               if (BrowseDir("Select folder for save/restore data", sr_path)) {
                 SIM->save_state(sr_path);
+                SendMessage(GetParent(hDlg), PSM_PRESSBUTTON, (WPARAM)PSBTN_CANCEL, 0);
               }
 #endif
               break;
diff --git a/bochs/win32res.rc b/bochs/win32res.rc
index 2fa318deb..ae4b69231 100644
--- a/bochs/win32res.rc
+++ b/bochs/win32res.rc
@@ -143,6 +143,6 @@ BEGIN
     EDITTEXT        IDSB16TIMER, 85, 105, 70, 14, ES_NUMBER
     LTEXT           "SB16 loglevel", IDMISCLBL5, 10, 127, 70, 14
     EDITTEXT        IDSBLOGLEV, 85, 125, 70, 14, ES_NUMBER
-    PUSHBUTTON      "Save state...", IDSAVESTATE, 85, 145, 50, 14
+    PUSHBUTTON      "Save state and quit...", IDSAVESTATE, 85, 145, 70, 14
 END