diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index daf37166e9b..765b12e228c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -187,7 +187,7 @@ Christian Donat <https://github.com/cdonat2>
 Asuka Minato <https://asukaminato.eu.org>
 Dillon Baldwin <https://github.com/DillBal>
 Voczi <https://github.com/voczi>
-Ben Nguyen <105088397+bpnguyen107@users.noreply.github.com>     
+Ben Nguyen <105088397+bpnguyen107@users.noreply.github.com>
 Themis Demetriades <themis100@outlook.com>
 Luke Bartholomew <lukesbart@icloud.com>
 Gregory Abrasaldo <degeemon@gmail.com>
@@ -203,6 +203,7 @@ hideo aoyama <https://github.com/boukendesho>
 Ross Brown <rbrownwsws@googlemail.com>
 🦙 <github.com/iamllama>
 Lukas Sommer <sommerluk@gmail.com>
+Tom Ampuero <tom.ampuero.c@gmail.com>
 
 ********************
 
diff --git a/qt/aqt/browser/browser.py b/qt/aqt/browser/browser.py
index 524887b08c1..c1e6d30eff2 100644
--- a/qt/aqt/browser/browser.py
+++ b/qt/aqt/browser/browser.py
@@ -380,6 +380,11 @@ def set_flag_func(desired_flag: int) -> Callable:
         add_ellipsis_to_action_label(f.actionCopy)
         add_ellipsis_to_action_label(f.action_forget)
 
+        if isinstance(self, AddCards):
+            f.actionClose.setVisible(False)
+        else:
+            f.actionClose.setVisible(True)
+
     def _editor_web_view(self) -> EditorWebView:
         assert self.editor is not None
         editor_web_view = self.editor.web
@@ -394,9 +399,11 @@ def closeEvent(self, evt: QCloseEvent | None) -> None:
             return
 
         assert self.editor is not None
-
-        self.editor.call_after_note_saved(self._closeWindow)
-        evt.ignore()
+        if current_window() == self:
+            self.editor.call_after_note_saved(self._closeWindow)
+            evt.accept()
+        else:
+            evt.ignore()
 
     def _closeWindow(self) -> None:
         assert self.editor is not None