diff --git a/static/js/components/shared/ModelModal.js b/static/js/components/shared/ModelModal.js
index 2aa84ac7..67b59276 100644
--- a/static/js/components/shared/ModelModal.js
+++ b/static/js/components/shared/ModelModal.js
@@ -940,8 +940,8 @@ function setupNavigationShortcuts(modelType) {
     const modalElement = document.getElementById('modelModal');
     if (!modalElement) return;
 
-    navigationModelType = modelType;
     cleanupNavigationShortcuts();
+    navigationModelType = modelType;
 
     navigationKeyHandler = (event) => {
         if (shouldIgnoreNavigationKey(event)) return;