diff --git a/khal/ui/__init__.py b/khal/ui/__init__.py
index 2baa71814e..7c13d24286 100644
--- a/khal/ui/__init__.py
+++ b/khal/ui/__init__.py
@@ -558,10 +558,9 @@ def teardown(data):
 
     def destroy(self):
         """if an event is displayed, remove it"""
-        if (len(self.container.contents) > 2 and
-                isinstance(self.container.contents[2][0], EventDisplay)):
-            self.container.contents.pop()
+        while len(self.container.contents) > 1:
             self.container.contents.pop()
+        self.current_event = None
 
     def new(self, date):
         """create a new event on date