diff --git a/components/Settings/ModuleEnabler.tsx b/components/Settings/ModuleEnabler.tsx
index fd08b5c80..52bf05ed1 100644
--- a/components/Settings/ModuleEnabler.tsx
+++ b/components/Settings/ModuleEnabler.tsx
@@ -4,26 +4,24 @@ import { useConfig } from '../../tools/state';
 
 export default function ModuleEnabler(props: any) {
   const { config, setConfig } = useConfig();
-  // Loop over each module with their title
-  const modules = Object.keys(Modules);
-  // Match the enabled modules with the modules array
-  let enabledModules = config.settings.enabledModules ?? [];
-  enabledModules = modules.filter((module) => enabledModules.includes(module));
+  const modules = Object.values(Modules).map((module) => module);
+  const enabledModules = config.settings.enabledModules ?? [];
+  modules.filter((module) => enabledModules.includes(module.title));
   return (
     <Group direction="column">
-      {modules.map((module: string) => (
+      {modules.map((module) => (
         <Switch
-          key={module}
+          key={module.title}
           size="md"
-          checked={enabledModules.includes(module)}
-          label={`Enable ${module.replace('Module', '')} module`}
+          checked={enabledModules.includes(module.title)}
+          label={`Enable ${module.title} module`}
           onChange={(e) => {
             if (e.currentTarget.checked) {
               setConfig({
                 ...config,
                 settings: {
                   ...config.settings,
-                  enabledModules: [...enabledModules, module],
+                  enabledModules: [...enabledModules, module.title],
                 },
               });
             } else {
@@ -31,7 +29,7 @@ export default function ModuleEnabler(props: any) {
                 ...config,
                 settings: {
                   ...config.settings,
-                  enabledModules: enabledModules.filter((m) => m !== module),
+                  enabledModules: enabledModules.filter((m) => m !== module.title),
                 },
               });
             }
diff --git a/components/modules/moduleWrapper.tsx b/components/modules/moduleWrapper.tsx
index 0c1398c09..91be8a7ff 100644
--- a/components/modules/moduleWrapper.tsx
+++ b/components/modules/moduleWrapper.tsx
@@ -7,9 +7,11 @@ export default function ModuleWrapper(props: any) {
   const { config } = useConfig();
   const enabledModules = config.settings.enabledModules ?? [];
   // Remove 'Module' from enabled modules titles
-  const enabledModulesTitles = enabledModules.map((module) => module.replace('Module', ''));
-  const isShown = enabledModulesTitles.includes(module.title);
+  const isShown = enabledModules.includes(module.title);
   const theme = useMantineTheme();
+  if (!isShown) {
+    return null;
+  }
   return (
     <Card
       hidden={!isShown}