diff --git a/js/ui/main.js b/js/ui/main.js
index 501af0441..0b12d7577 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -683,7 +683,7 @@ function pushModal(actor, timestamp, options) {
     let actorDestroyId = actor.connect('destroy', function() {
         let index = _findModal(actor);
         if (index >= 0)
-            modalActorFocusStack.splice(index, 1);
+            popModal(actor);
     });
     let curFocus = global.stage.get_key_focus();
     let curFocusDestroyId;