diff --git a/main.go b/main.go
index e833c79..3ec19e3 100644
--- a/main.go
+++ b/main.go
@@ -182,7 +182,11 @@ func main() {
 			} else {
 				switch event.Key() {
 				case tcell.KeyEsc:
-					app.UI.SetFocus(LeftPaneFocus)
+					if app.UI.StatusView.focus == NotificationPaneFocus {
+						app.UI.SetFocus(NotificationPaneFocus)
+					} else {
+						app.UI.SetFocus(LeftPaneFocus)
+					}
 					return nil
 				}
 			}