diff --git a/ChangeLog b/ChangeLog
index 65e790a6..b624a1dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2026-05-15  Mats Lidell  <matsl@gnu.org>
+
+* hycontrol.el: Move minor-mode definitions section up so it occurs
+    before use of the minor-mode variables.
+
 2026-05-12  Mats Lidell  <matsl@gnu.org>
 
 * Makefile (HYPB_NATIVE_COMP): Use MAKE variable in recursive make.
diff --git a/hycontrol.el b/hycontrol.el
index 2255b485..0645b80d 100644
--- a/hycontrol.el
+++ b/hycontrol.el
@@ -91,7 +91,7 @@
 ;;   perpendicular to that edge by 50% while keeping the original edge
 ;;   fixed in place.  Try them and you will quickly see how they can
 ;;   help.
-;;   
+;;
 ;;   ----
 ;;
 ;;   When HyControl creates a new frame, it automatically sizes it to the
@@ -532,6 +532,48 @@ The cycle is in clockwise order from the upper left corner.")
   "Store value of `which-key-inhibit' flag from \"which-key\" package, if any.
 Used on entry to HyControl.")
 
+;; This just sets the keymap locally and shows the minor mode
+;; indicator in the buffer's mode-line; the separate global minor mode
+;; turns things on and off.
+;;;###autoload
+(define-minor-mode hycontrol-local-frames-mode
+  "Toggle Hyperbole Frames control minor mode in the current buffer."
+  :lighter " HyFrm"
+  :group 'hyperbole-screen)
+
+;;;###autoload
+(define-globalized-minor-mode hycontrol-frames-mode hycontrol-local-frames-mode
+  (lambda () (hycontrol-local-frames-mode 1))
+  :group 'hyperbole-screen)
+
+;; These hooks run by the generated `hycontrol-frames-mode' function
+;; do the global work of turning on and off the mode.
+(add-hook 'hycontrol-frames-mode-on-hook
+	  (lambda () (hycontrol-frames current-prefix-arg)))
+
+(add-hook 'hycontrol-frames-mode-off-hook 'hycontrol-end-mode)
+
+;; This just sets the keymap locally and shows the minor mode
+;; indicator in the buffer's mode-line; the separate global minor mode
+;; turns things on and off.
+;;;###autoload
+(define-minor-mode hycontrol-local-windows-mode
+  "Toggle Hyperbole Windows control minor mode in the current buffer."
+  :lighter " HyWin"
+  :group 'hyperbole-screen)
+
+;;;###autoload
+(define-globalized-minor-mode hycontrol-windows-mode hycontrol-local-windows-mode
+  (lambda () (hycontrol-local-windows-mode 1))
+  :group 'hyperbole-screen)
+
+;; These hooks run by the generated `hycontrol-windows-mode' function
+;; do the global work of turning on and off the mode.
+(add-hook 'hycontrol-windows-mode-on-hook
+	  (lambda () (hycontrol-windows current-prefix-arg)))
+
+(add-hook 'hycontrol-windows-mode-off-hook 'hycontrol-end-mode)
+
 ;;; ************************************************************************
 ;;; Private functions
 ;;; ************************************************************************
@@ -1101,48 +1143,6 @@ instead of quitting HyControl."
       (message "Hyperbole finished controlling frames"))
     (hycontrol-disable-modes)))
 
-;; This just sets the keymap locally and shows the minor mode
-;; indicator in the buffer's mode-line; the separate global minor mode
-;; turns things on and off.
-;;;###autoload
-(define-minor-mode hycontrol-local-frames-mode
-  "Toggle Hyperbole Frames control minor mode in the current buffer."
-  :lighter " HyFrm"
-  :group 'hyperbole-screen)
-
-;;;###autoload
-(define-globalized-minor-mode hycontrol-frames-mode hycontrol-local-frames-mode
-  (lambda () (hycontrol-local-frames-mode 1))
-  :group 'hyperbole-screen)
-
-;; These hooks run by the generated `hycontrol-frames-mode' function
-;; do the global work of turning on and off the mode.
-(add-hook 'hycontrol-frames-mode-on-hook
-	  (lambda () (hycontrol-frames current-prefix-arg)))
-
-(add-hook 'hycontrol-frames-mode-off-hook 'hycontrol-end-mode)
-
-;; This just sets the keymap locally and shows the minor mode
-;; indicator in the buffer's mode-line; the separate global minor mode
-;; turns things on and off.
-;;;###autoload
-(define-minor-mode hycontrol-local-windows-mode
-  "Toggle Hyperbole Windows control minor mode in the current buffer."
-  :lighter " HyWin"
-  :group 'hyperbole-screen)
-
-;;;###autoload
-(define-globalized-minor-mode hycontrol-windows-mode hycontrol-local-windows-mode
-  (lambda () (hycontrol-local-windows-mode 1))
-  :group 'hyperbole-screen)
-
-;; These hooks run by the generated `hycontrol-windows-mode' function
-;; do the global work of turning on and off the mode.
-(add-hook 'hycontrol-windows-mode-on-hook
-	  (lambda () (hycontrol-windows current-prefix-arg)))
-
-(add-hook 'hycontrol-windows-mode-off-hook 'hycontrol-end-mode)
-
 ;;; Frame Display Commands
 (defun hycontrol-delete-other-frames ()
   "Confirm and then delete all other frames."