diff --git a/src/commands/view/OpenAssets.js b/src/commands/view/OpenAssets.js
index 5f03b4ff9..93b51ee66 100644
--- a/src/commands/view/OpenAssets.js
+++ b/src/commands/view/OpenAssets.js
@@ -30,7 +30,14 @@ export default {
       uploadEl && uploadEl.setAttribute('accept', accept);
     }
 
-    modal.open({ title, content: this.rendered });
+    modal
+      .open({ title, content: this.rendered })
+      .onceClose(() => editor.stopCommand(this.id));
     return this;
+  },
+
+  stop(editor) {
+    const { Modal } = editor;
+    Modal && Modal.close();
   }
 };