diff --git a/src/shared/Modules/Module.cpp b/src/shared/Modules/Module.cpp
index 57d452ab02eda9dc4e417931c60e1095cef110df..a3474ea5a461379d9d0c6e3f1241a432b0d95d66 100644
--- a/src/shared/Modules/Module.cpp
+++ b/src/shared/Modules/Module.cpp
@@ -55,9 +55,7 @@ Module::Module(ModuleId id) : id(id)
 
                     // Load hub actions
                     menu.addSeparator();
-                    menu.addActions(
-                        SkywardHubCore::getInstance().getHubMenuActions());
-
+                    SkywardHubCore::getInstance().addActionsToMenu(menu);
                     menu.exec(mapToGlobal(pos));
                 });
     }
@@ -93,10 +91,7 @@ void Module::onReplaceMe()
         });
 
     auto NewModuleEventEmitter = [this](ModuleId id)
-    {
-        emit replaceMe(std::shared_ptr<Module>(this),
-                       ModulesList::getInstance().instantiateModule(id));
-    };
+    { emit replaceMe(this, ModulesList::getInstance().instantiateModule(id)); };
 
     connect(picker.get(), &ModulesPicker::onModuleSelected, this,
             NewModuleEventEmitter);
diff --git a/src/shared/Modules/Module.h b/src/shared/Modules/Module.h
index f6cdab3da91effbb985e0ec0529cf065a4807916..4766e736b048622342cdcc1f4080be56b6e6ba5e 100644
--- a/src/shared/Modules/Module.h
+++ b/src/shared/Modules/Module.h
@@ -57,8 +57,7 @@ public slots:
     // void onCloseMe();
 
 signals:
-    void replaceMe(std::shared_ptr<Module> oldModule,
-                   std::shared_ptr<Module> newModule);
+    void replaceMe(const Module* oldModule, std::shared_ptr<Module> newModule);
     void closeMe(std::shared_ptr<Module> thisModule);
 
 protected: