diff --git a/src/atom_window.py b/src/atom_window.py
index ff2adf3064ed5a40f49edc113b24312ef9b04ee2..a9ce998b3ffd6352753eb029406aee53fc4f7fec 100644
--- a/src/atom_window.py
+++ b/src/atom_window.py
@@ -42,6 +42,10 @@ class AtomWindow:
 		else:
 			cls.window.updateCounter()
 
+	@classmethod
+	def windowClosed(cls):
+		cls.window = None
+
 	def __init__(self):
 		''' Create new window... only if we have anything to show. '''
 		assert len(self.__class__.entries)>0
@@ -113,6 +117,7 @@ class AtomWindow:
 
 	def on_close_button_clicked(self, widget):
 		self.window.destroy()
+		self.windowClosed()
 
 	def on_next_button_clicked(self, widget):
 		self.displayNextEntry()