diff --git a/lisp/org.el b/lisp/org.el
index 2501a2342..4e8bd9c48 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -20468,8 +20468,8 @@ Also updates the keyword regular expressions."
   (interactive)
   ;; this will set the mode *and* set file local variables.
   (normal-mode)
-  ;; but it may leave us in some other mode
-  (unless (string= "org-mode" mode-name)
+  ;; but it may leave us in some unrelated mode
+  (unless (derived-mode-p "org-mode")
     (org-mode))
   (message "Org-mode restarted"))