diff --git a/src/options.c b/src/options.c
index e8ffe174b..d23a1a01d 100644
--- a/src/options.c
+++ b/src/options.c
@@ -10258,8 +10258,10 @@ set_playmode(void)
         else
             wizard = FALSE; /* not allowed or not available */
         /* try explore mode if we didn't make it into wizard mode */
+        /* if requesting wizard mode when restoring a normal game, this will
+           set iflags.deferred_X and prompt to activate explore mode after the
+           save file has already been deleted */
         discover = !wizard;
-        iflags.deferred_X = FALSE;
     }
     if (discover && !authorize_explore_mode()) {
         discover = iflags.deferred_X = FALSE;
diff --git a/sys/libnh/libnhmain.c b/sys/libnh/libnhmain.c
index 5770c5c4e..d7d757cd3 100644
--- a/sys/libnh/libnhmain.c
+++ b/sys/libnh/libnhmain.c
@@ -633,14 +633,12 @@ wd_message(void)
         } else {
             You("cannot access debug (wizard) mode.");
         }
-        wizard = 0; /* (paranoia) */
-        if (!explore_error_flag) {
+        wizard = FALSE; /* (paranoia) */
+        if (!explore_error_flag)
             pline("Entering explore/discovery mode instead.");
-            discover = 1;
-        }
     } else if (explore_error_flag) {
         You("cannot access explore mode."); /* same as enter_explore_mode */
-        discover = 0; /* (more paranoia) */
+        discover = iflags.deferred_X = FALSE; /* (more paranoia) */
     } else if (discover)
         You("are in non-scoring explore/discovery mode.");
 }
diff --git a/sys/unix/unixmain.c b/sys/unix/unixmain.c
index 2da764cae..ec039ddf7 100644
--- a/sys/unix/unixmain.c
+++ b/sys/unix/unixmain.c
@@ -992,14 +992,12 @@ wd_message(void)
         } else {
             You("cannot access debug (wizard) mode.");
         }
-        wizard = 0; /* (paranoia) */
-        if (!explore_error_flag) {
+        wizard = FALSE; /* (paranoia) */
+        if (!explore_error_flag)
             pline("Entering explore/discovery mode instead.");
-            discover = 1;
-        }
     } else if (explore_error_flag) {
         You("cannot access explore mode."); /* same as enter_explore_mode */
-        discover = 0; /* (more paranoia) */
+        discover = iflags.deferred_X = FALSE; /* (more paranoia) */
     } else if (discover)
         You("are in non-scoring explore/discovery mode.");
 }