diff --git a/assets/chat/js/chat.js b/assets/chat/js/chat.js
index 2411c67c..3991c6a9 100644
--- a/assets/chat/js/chat.js
+++ b/assets/chat/js/chat.js
@@ -346,9 +346,6 @@ class Chat {
       ),
     );
 
-    this.commands
-      .generateAutocomplete(this.user.hasModPowers())
-      .forEach((command) => this.autocomplete.add(command));
     this.autocomplete.bind(this);
 
     // Chat input
@@ -683,6 +680,11 @@ class Chat {
     $(document.body).toggleClass(`pref-fontscale`, fontscale !== 'auto');
     $(document.body).attr('data-fontscale', fontscale);
 
+    // Add command autocomplete
+    this.commands
+      .generateAutocomplete(this.user.hasModPowers())
+      .forEach((command) => this.autocomplete.add(command));
+
     for (const window of this.windows.values()) {
       window.updateMessages(this);
     }