diff --git a/README.md b/README.md
index b4d798b9e6..6c8e3f3c50 100644
--- a/README.md
+++ b/README.md
@@ -178,6 +178,8 @@ information on what to include when reporting a bug.
  - [Cocoa] Bugfix: Failing to retrieve the refresh rate of built-in displays
    could leak memory
  - [Cocoa] Bugfix: Objective-C files were compiled as C with CMake 3.19 (#1787)
+ - [Cocoa] Bugfix: Menubar was not clickable on macOS 10.15+ until it lost and
+   regained focus (#1648,#1802)
  - [X11] Bugfix: The CMake files did not check for the XInput headers (#1480)
  - [X11] Bugfix: Key names were not updated when the keyboard layout changed
    (#1462,#1528)
@@ -439,6 +441,7 @@ skills.
  - Frank Wille
  - Andy Williams
  - Joel Winarske
+ - Richard A. Wilkes
  - Tatsuya Yatagawa
  - Ryogo Yoshimura
  - Lukas Zanner
diff --git a/src/cocoa_init.m b/src/cocoa_init.m
index edd174be44..88decab654 100644
--- a/src/cocoa_init.m
+++ b/src/cocoa_init.m
@@ -428,9 +428,6 @@ - (void)applicationWillFinishLaunching:(NSNotification *)notification
 {
     if (_glfw.hints.init.ns.menubar)
     {
-        // In case we are unbundled, make us a proper UI application
-        [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
-
         // Menu bar setup must go between sharedApplication and finishLaunching
         // in order to properly emulate the behavior of NSApplicationMain
 
@@ -557,6 +554,9 @@ int _glfwPlatformInit(void)
     if (![[NSRunningApplication currentApplication] isFinishedLaunching])
         [NSApp run];
 
+    // In case we are unbundled, make us a proper UI application
+    [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
+
     return GLFW_TRUE;
 
     } // autoreleasepool