diff --git a/buttons.c b/buttons.c
index a4d13679..786d1a73 100644
--- a/buttons.c
+++ b/buttons.c
@@ -1637,9 +1637,19 @@ void Button_Resolution(void)
 
 void Button_Safety_resolution(void)
 {
+  // In windowed mode, do nothing
+  if (Current_resolution==0)
+  {
+    Hide_cursor();
+    Unselect_button(BUTTON_RESOL);
+    Display_cursor();
+    return;
+  }
+  
   Hide_cursor();
 
   Unselect_button(BUTTON_MAGNIFIER);
+  
   Init_mode_video(640, 400, 0,PIXEL_SIMPLE);
   Current_resolution=0;
   Display_menu();
diff --git a/main.c b/main.c
index ecea92a9..4af8f310 100644
--- a/main.c
+++ b/main.c
@@ -405,7 +405,7 @@ int Init_program(int argc,char * argv[])
   SDL_EnableKeyRepeat(250, 32);
   SDL_EnableUNICODE(SDL_ENABLE);
   if(ALPHA_BETA[0]=='ß')
-    SDL_WM_SetCaption("GrafX2 beta "PERCENTAGE_VERSION""" - USE AT YOUR OWN RISK","GrafX2");
+    SDL_WM_SetCaption("GrafX2 beta "PERCENTAGE_VERSION,"GrafX2");
   else
     SDL_WM_SetCaption("GrafX2 v2.00 final","GrafX2");
   {