diff --git a/ace-window.el b/ace-window.el
index ccb2783..d950cc2 100644
--- a/ace-window.el
+++ b/ace-window.el
@@ -739,7 +739,9 @@ Windows are numbered top down, left to right."
 (defun aw-flip-window ()
   "Switch to the window you were previously in."
   (interactive)
-  (aw-switch-to-window (aw--pop-window)))
+  (let ((win (get-mru-window t t t)))
+    (unless win (error "Last window not found"))
+    (aw-switch-to-window win)))
 
 (defun aw-show-dispatch-help ()
   "Display action shortucts in echo area."