diff --git a/tagstudio/src/qt/modals/tag_database.py b/tagstudio/src/qt/modals/tag_database.py
index bc5cfce9..f52761aa 100644
--- a/tagstudio/src/qt/modals/tag_database.py
+++ b/tagstudio/src/qt/modals/tag_database.py
@@ -72,14 +72,14 @@ class TagDatabasePanel(PanelWidget):
         self.update_tags()
 
     def build_tag(self):
+        panel = BuildTagPanel(self.lib)
         self.modal = PanelModal(
-            BuildTagPanel(self.lib),
+            panel,
             "New Tag",
             "Add Tag",
             has_save=True,
         )
 
-        panel: BuildTagPanel = self.modal.widget
         self.modal.saved.connect(
             lambda: (
                 self.lib.add_tag(
diff --git a/tagstudio/src/qt/ts_qt.py b/tagstudio/src/qt/ts_qt.py
index 2c238807..b6f34d56 100644
--- a/tagstudio/src/qt/ts_qt.py
+++ b/tagstudio/src/qt/ts_qt.py
@@ -624,14 +624,14 @@ class QtDriver(DriverMixin, QObject):
         )
 
     def add_tag_action_callback(self):
+        panel = BuildTagPanel(self.lib)
         self.modal = PanelModal(
-            BuildTagPanel(self.lib),
+            panel,
             "New Tag",
             "Add Tag",
             has_save=True,
         )
 
-        panel: BuildTagPanel = self.modal.widget
         self.modal.saved.connect(
             lambda: (
                 self.lib.add_tag(