diff --git a/src/buttons.c b/src/buttons.c
index 503f0489..249c1ce4 100644
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -679,7 +679,7 @@ void Button_Quit(int btn)
   {
     if (Spare.image_is_modified)
     {
-      Button_Page(btn); // On passe sur le brouillon
+      Button_Page(BUTTON_PAGE); // On passe sur le brouillon
       // Si l'utilisateur présente les derniers symptomes de l'abandon
       if (Button_Quit_local_function())
         Quitting=1;
@@ -691,7 +691,7 @@ void Button_Quit(int btn)
   if ( (Menu_is_visible) && (Mouse_Y+8>Menu_Y) )
     Hide_cursor();
 
-  Unselect_button(BUTTON_QUIT);
+  Unselect_button(btn);
 
   if ( (Menu_is_visible) && (Mouse_Y+8>Menu_Y) )
     Display_cursor();
diff --git a/src/engine.c b/src/engine.c
index e1abf3d9..3774a222 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -730,7 +730,7 @@ void Main_handler(void)
       if (Quit_is_required)
       {
         Quit_is_required=0;
-        Button_Quit(-1);
+        Button_Quit(BUTTON_QUIT);
       }
       
       if (Pan_shortcut_pressed && Current_operation!=OPERATION_PAN_VIEW)
diff --git a/src/loadsave.c b/src/loadsave.c
index 1d127897..e616a51e 100644
--- a/src/loadsave.c
+++ b/src/loadsave.c
@@ -1588,7 +1588,7 @@ if (Create_lock_file(Config_directory))
     Compute_limits();
     Compute_paintbrush_coordinates();
     if (Backups_main)
-      Button_Page(-1);
+      Button_Page(BUTTON_PAGE);
   }
   restored_main = Process_backups(&Backups_main);
   
diff --git a/src/main.c b/src/main.c
index c0565d9c..b637975a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -969,7 +969,7 @@ int Init_program(int argc,char * argv[])
           Redraw_layered_image();
           End_of_modification();
   
-          Button_Page(-1);
+          Button_Page(BUTTON_PAGE);
           // no break ! proceed with the other file now
         case 1:
           Init_context_layered_image(&context, main_filename, main_directory);