diff --git a/src/core/interface/gui.py b/src/core/interface/gui.py
index 8bd4b75..8ed66a4 100644
--- a/src/core/interface/gui.py
+++ b/src/core/interface/gui.py
@@ -513,12 +513,12 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         event.accept()
 
     def set_tracker(self, _):
+        old_tracker = state.tracker
         state.tracker = self.tracker_list.currentText()
 
-        while self.horizontal_layout.count():
-            item = self.horizontal_layout.takeAt(0)
-            if item.widget():
-                item.widget().setParent(None)
+        old_widget = state.tracker_list[old_tracker]
+        self.horizontal_layout.removeWidget(old_widget)
+        old_widget.setParent(None)
 
         tracker_widget = state.tracker_list[state.tracker]
         self.horizontal_layout.addWidget(tracker_widget)
diff --git a/src/core/interface/utils/searchhelper.py b/src/core/interface/utils/searchhelper.py
index be8a6cb..9dae1a5 100644
--- a/src/core/interface/utils/searchhelper.py
+++ b/src/core/interface/utils/searchhelper.py
@@ -55,7 +55,7 @@ def return_pressed(self):
             state.tracker_list[state.tracker].clear()
             self.show_empty_results(True)
         else:
-            state.post_author, state.post_titles, state.post_urls  = format_data_minimal(state.posts)
+            state.post_author, state.post_titles, state.post_urls = format_data_minimal(state.posts)
             self.show_empty_results(False)
             state.tracker_list[state.tracker].clear()
             state.tracker_list[state.tracker].setHorizontalHeaderLabels(["Post Title", "Author"])