--- hatari/src/gui-sdl/dlgJoystick.c	2019/04/01 07:13:15	1.1.1.4
+++ hatari/src/gui-sdl/dlgJoystick.c	2019/04/01 07:13:50	1.1.1.5
@@ -4,7 +4,7 @@
   This file is distributed under the GNU Public License, version 2 or at
   your option any later version. Read the file gpl.txt for details.
 */
-const char DlgJoystick_rcsid[] = "Hatari $Id: dlgJoystick.c,v 1.1.1.4 2019/04/01 07:13:15 root Exp $";
+const char DlgJoystick_rcsid[] = "Hatari $Id: dlgJoystick.c,v 1.1.1.5 2019/04/01 07:13:50 root Exp $";
 
 #include "main.h"
 #include "configuration.h"
@@ -53,7 +53,7 @@ static SGOBJ joydlg[] =
 	{ SGBUTTON, 0, 0, 1,3, 3,1, "\x04" },         /* Arrow left */
 	{ SGBUTTON, 0, 0, 28,3, 3,1, "\x03" },        /* Arrow right */
 
-	{ SGBUTTON, 0, 0, 6,16, 20,1, "Back to main menu" },
+	{ SGBUTTON, SG_DEFAULT, 0, 6,16, 20,1, "Back to main menu" },
 	{ -1, 0, 0, 0,0, 0,0, NULL }
 };
 
@@ -257,7 +257,8 @@ void Dialog_JoyDlg(void)
 			break;
 		}
 	}
-	while (but != DLGJOY_EXIT && but != SDLGUI_QUIT && !bQuitProgram );
+	while (but != DLGJOY_EXIT && but != SDLGUI_QUIT
+	       && but != SDLGUI_ERROR && !bQuitProgram);
 
 	DlgJoystick_WriteValuesToConf(nActJoy);
 }