diff --git a/gui/qt/address_list.py b/gui/qt/address_list.py
index 2851ebbdb..3bdeacfe7 100644
--- a/gui/qt/address_list.py
+++ b/gui/qt/address_list.py
@@ -53,6 +53,11 @@ class AddressList(MyTreeWidget):
     def create_toolbar_buttons(self):
         return QLabel(_("Filter:")), self.change_button, self.used_button
 
+    def on_hide_toolbar(self):
+        self.show_change = 0
+        self.show_used = 0
+        self.update()
+
     def refresh_headers(self):
         headers = [_('Type'), _('Address'), _('Label'), _('Balance')]
         fx = self.parent.fx
diff --git a/gui/qt/history_list.py b/gui/qt/history_list.py
index c87e92c6d..a5f7b1e63 100644
--- a/gui/qt/history_list.py
+++ b/gui/qt/history_list.py
@@ -114,6 +114,11 @@ class HistoryList(MyTreeWidget, AcceptFileDragDrop):
         self.period_combo.activated.connect(self.on_combo)
         return self.period_combo, self.start_button, self.end_button
 
+    def on_hide_toolbar(self):
+        self.start_timestamp = None
+        self.end_timestamp = None
+        self.update()
+
     def select_start_date(self):
         self.start_timestamp = self.select_date(self.start_button)
         self.update()
diff --git a/gui/qt/util.py b/gui/qt/util.py
index 095d79407..26d4448ce 100644
--- a/gui/qt/util.py
+++ b/gui/qt/util.py
@@ -539,6 +539,8 @@ class MyTreeWidget(QTreeWidget):
     def show_toolbar(self, x):
         for b in self.toolbar_buttons:
             b.setVisible(x)
+        if not x:
+            self.on_hide_toolbar()
 
 
 class ButtonsWidget(QWidget):