diff --git a/tools/cli_gen_tool_src/modules/main_window.py b/tools/cli_gen_tool_src/modules/main_window.py
index 6c88c73fa..04f6fc08c 100644
--- a/tools/cli_gen_tool_src/modules/main_window.py
+++ b/tools/cli_gen_tool_src/modules/main_window.py
@@ -72,11 +72,11 @@
 # MainWindow is the parent of all process subwindows
 # (MainWindow is noninteractable when any of its child popups are active except log history)
 class MainWindow(
+    QMainWindow,
     Pathing,
     Logger,
     UserDialogs,
-    NoDialogFileManipulation,
-    QMainWindow,
+    NoDialogFileManipulation,    
     SettingsTreeMethods,
     CommandParametersMethods,
     CommandTreeMethods,
@@ -243,7 +243,7 @@ def set_main_window_title(self, title: str = None) -> None:
             self.setWindowTitle(windowtitle)
             self.windowtitle_set = True
 
-    def eventFilter(self, watched: QObject, event: QEvent) -> bool:
+    def eventFilter(self, watched: QObject, event: QEvent):
         """MainWindow event filter
 
         Args:
@@ -279,6 +279,7 @@ def eventFilter(self, watched: QObject, event: QEvent) -> bool:
                 self.command_tree.clearSelection()
                 self.command_tree.setCurrentItem(self.command_tree.invisibleRootItem())
                 self.command_tree_button_toggles()
+        return super(MainWindow, self).eventFilter(watched, event)
 
     def closeEvent(self, event: QEvent):
         """do these things on app close