diff --git a/src/history_window.py b/src/history_window.py
index 90a412126bf56a27b199ce2732c643279e1a4e26..6f700b062ae6471943faeb21e0c3d4dda7079673 100644
--- a/src/history_window.py
+++ b/src/history_window.py
@@ -118,6 +118,8 @@ class HistoryWindow:
 
 		if jid:
 			self.jid_entry.set_text(jid)
+		else:
+			self._load_history(None)
 
 		gtkgui_helpers.resize_window(self.window,
 			gajim.config.get('history_window_width'),