1 files changed, 18 insertions, 0 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index 23b5d0311..a36f04541 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -75,6 +75,7 @@
 #include "amiga/font.h"
 #include "amiga/download.h"
 #include <graphics/blitattr.h>
+#include "amiga/gui_options.h"
 
 #ifdef NS_AMIGA_CAIRO
 #include <cairo/cairo-amigaos.h>
@@ -793,6 +794,23 @@ void ami_handle_msg(void)
 				continue;
 			}
 		}
+		else if(node->Type == AMINS_GUIOPTSWINDOW)
+		{
+			if(ami_gui_opts_event())
+			{
+				if(IsMinListEmpty(window_list))
+				{
+					/* last window closed, so exit */
+					netsurf_quit = true;
+				}
+				break;
+			}
+			else
+			{
+				node = nnode;
+				continue;
+			}
+		}
 
 		while((result = RA_HandleInput(gwin->objects[OID_MAIN],&code)) != WMHI_LASTMSG)
 		{