1 files changed, 3 insertions, 2 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index 61a4e3f08..18288cdad 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -842,8 +842,9 @@ void ami_handle_msg(void)
 			{
 				if(IsMinListEmpty(window_list))
 				{
-					/* last window closed, so exit */
-					netsurf_quit = true;
+					/* last window closed, so exit with conditions ;) */
+					if(scrn && (option_close_no_quit == false))
+						netsurf_quit = true;
 				}
 				break;
 			}