diff --git a/pype/avalon_apps/__init__.py b/pype/avalon_apps/__init__.py
index 1d7c3c8a81..845f94a330 100644
--- a/pype/avalon_apps/__init__.py
+++ b/pype/avalon_apps/__init__.py
@@ -1,8 +1,5 @@
 from .avalon_app import AvalonApps
 
 
-def tray_init(tray_widget, main_widget, parent_menu):
-    av_apps = AvalonApps(main_widget, tray_widget)
-    av_apps.tray_menu(tray_widget.menu)
-
-    return av_apps
+def tray_init(tray_widget, main_widget):
+    return AvalonApps(main_widget, tray_widget)
diff --git a/pype/ftrack/__init__.py b/pype/ftrack/__init__.py
index cdaacca68c..922de28e16 100644
--- a/pype/ftrack/__init__.py
+++ b/pype/ftrack/__init__.py
@@ -1,11 +1,7 @@
 from .lib import *
 from .ftrack_server import *
-from .ftrack_run import FtrackRunner
+from .ftrack_module import FtrackModule
 
 
-def tray_init(tray_widget, main_widget, parent_menu):
-    ftrack = FtrackRunner(main_widget, tray_widget)
-    main_widget.menu.addMenu(ftrack.trayMenu(parent_menu))
-    ftrack.validate()
-
-    return ftrack
+def tray_init(tray_widget, main_widget):
+    return FtrackModule(main_widget, tray_widget)