diff --git a/src/static/js/pages/keys.js b/src/static/js/pages/keys.js
index 69ac8d0..20b666a 100644
--- a/src/static/js/pages/keys.js
+++ b/src/static/js/pages/keys.js
@@ -132,18 +132,18 @@ const KeysPage = (() => {
         errEl.style.display = 'none';
         try {
           const key = await Api.post('/api/keys', { label });
-          _setupDownloadStep(key.raw_key);
           document.getElementById('step-create').style.display = 'none';
           document.getElementById('step-done').style.display = '';
-          await load(container); // refresh table in background
+          _setupDownloadStep(key.raw_key);
         } catch (e) {
           errEl.textContent = e.message;
           errEl.style.display = 'block';
         }
       };
 
-      document.getElementById('btn-done-key').onclick = () => {
+      document.getElementById('btn-done-key').onclick = async () => {
         document.getElementById('new-key-modal').classList.remove('open');
+        await load(container); // refresh table after modal closes
       };
 
       // ── Revoke buttons ──