diff --git a/src/components/Dashboard/Wrappers/Category/Category.tsx b/src/components/Dashboard/Wrappers/Category/Category.tsx
index e04617166..638f72b20 100644
--- a/src/components/Dashboard/Wrappers/Category/Category.tsx
+++ b/src/components/Dashboard/Wrappers/Category/Category.tsx
@@ -8,13 +8,14 @@ import { GridstackTileWrapper } from '../../Tiles/TileWrapper';
 import { useEditModeStore } from '../../Views/useEditModeStore';
 import { useGridstack } from '../gridstack/use-gridstack';
 import { CategoryEditMenu } from './CategoryEditMenu';
+import { WrapperContent } from '../WrapperContent';
 
 interface DashboardCategoryProps {
   category: CategoryType;
 }
 
 export const DashboardCategory = ({ category }: DashboardCategoryProps) => {
-  const { refs, items, widgets } = useGridstack('category', category.id);
+  const { refs, apps, widgets } = useGridstack('category', category.id);
   const isEditMode = useEditModeStore((x) => x.enabled);
 
   return (
@@ -29,42 +30,7 @@ export const DashboardCategory = ({ category }: DashboardCategoryProps) => {
         data-category={category.id}
         ref={refs.wrapper}
       >
-        {items?.map((app) => {
-          const { component: TileComponent, ...tile } = Tiles['app'];
-          return (
-            <GridstackTileWrapper
-              id={app.id}
-              type="app"
-              key={app.id}
-              itemRef={refs.items.current[app.id]}
-              {...tile}
-              {...app.shape.location}
-              {...app.shape.size}
-            >
-              <TileComponent className="grid-stack-item-content" app={app} />
-            </GridstackTileWrapper>
-          );
-        })}
-        {widgets.map((widget) => {
-          const definition = Widgets[widget.id as keyof typeof Widgets] as
-            | IWidgetDefinition
-            | undefined;
-          if (!definition) return null;
-
-          return (
-            <GridstackTileWrapper
-              type="widget"
-              key={widget.id}
-              itemRef={refs.items.current[widget.id]}
-              id={definition.id}
-              {...definition.gridstack}
-              {...widget.shape.location}
-              {...widget.shape.size}
-            >
-              <definition.component className="grid-stack-item-content" widget={widget} />
-            </GridstackTileWrapper>
-          );
-        })}
+        <WrapperContent apps={apps} refs={refs} widgets={widgets} />
       </div>
     </HomarrCardWrapper>
   );
diff --git a/src/components/Dashboard/Wrappers/Sidebar/Sidebar.tsx b/src/components/Dashboard/Wrappers/Sidebar/Sidebar.tsx
index 605df53ff..bfa37a628 100644
--- a/src/components/Dashboard/Wrappers/Sidebar/Sidebar.tsx
+++ b/src/components/Dashboard/Wrappers/Sidebar/Sidebar.tsx
@@ -5,13 +5,14 @@ import { Tiles } from '../../Tiles/tilesDefinitions';
 import Widgets from '../../../../widgets';
 import { GridstackTileWrapper } from '../../Tiles/TileWrapper';
 import { useGridstack } from '../gridstack/use-gridstack';
+import { WrapperContent } from '../WrapperContent';
 
 interface DashboardSidebarProps {
   location: 'right' | 'left';
 }
 
 export const DashboardSidebar = ({ location }: DashboardSidebarProps) => {
-  const { refs, items, widgets } = useGridstack('sidebar', location);
+  const { refs, apps, widgets } = useGridstack('sidebar', location);
 
   const minRow = useMinRowForFullHeight(refs.wrapper);
 
@@ -31,42 +32,7 @@ export const DashboardSidebar = ({ location }: DashboardSidebarProps) => {
         gs-min-row={minRow}
         ref={refs.wrapper}
       >
-        {items.map((app) => {
-          const { component: TileComponent, ...tile } = Tiles['app'];
-          return (
-            <GridstackTileWrapper
-              id={app.id}
-              type="app"
-              key={app.id}
-              itemRef={refs.items.current[app.id]}
-              {...tile}
-              {...app.shape.location}
-              {...app.shape.size}
-            >
-              <TileComponent className="grid-stack-item-content" app={app} />
-            </GridstackTileWrapper>
-          );
-        })}
-        {widgets.map((widget) => {
-          const definition = Widgets[widget.id as keyof typeof Widgets] as
-            | IWidgetDefinition
-            | undefined;
-          if (!definition) return null;
-
-          return (
-            <GridstackTileWrapper
-              type="widget"
-              key={widget.id}
-              itemRef={refs.items.current[widget.id]}
-              id={definition.id}
-              {...definition.gridstack}
-              {...widget.shape.location}
-              {...widget.shape.size}
-            >
-              <definition.component className="grid-stack-item-content" widget={widget} />
-            </GridstackTileWrapper>
-          );
-        })}
+        <WrapperContent apps={apps} refs={refs} widgets={widgets} />
       </div>
     </Card>
   );
diff --git a/src/components/Dashboard/Wrappers/Wrapper/Wrapper.tsx b/src/components/Dashboard/Wrappers/Wrapper/Wrapper.tsx
index 2c3996a04..ab8d92319 100644
--- a/src/components/Dashboard/Wrappers/Wrapper/Wrapper.tsx
+++ b/src/components/Dashboard/Wrappers/Wrapper/Wrapper.tsx
@@ -1,16 +1,13 @@
 import { WrapperType } from '../../../../types/wrapper';
-import Widgets from '../../../../widgets';
-import { IWidget, IWidgetDefinition } from '../../../../widgets/widgets';
-import { Tiles } from '../../Tiles/tilesDefinitions';
-import { GridstackTileWrapper } from '../../Tiles/TileWrapper';
 import { useGridstack } from '../gridstack/use-gridstack';
+import { WrapperContent } from '../WrapperContent';
 
 interface DashboardWrapperProps {
   wrapper: WrapperType;
 }
 
 export const DashboardWrapper = ({ wrapper }: DashboardWrapperProps) => {
-  const { refs, items, widgets } = useGridstack('wrapper', wrapper.id);
+  const { refs, apps, widgets } = useGridstack('wrapper', wrapper.id);
 
   return (
     <div
@@ -19,42 +16,7 @@ export const DashboardWrapper = ({ wrapper }: DashboardWrapperProps) => {
       data-wrapper={wrapper.id}
       ref={refs.wrapper}
     >
-      {items?.map((app) => {
-        const { component: TileComponent, ...tile } = Tiles['app'];
-        return (
-          <GridstackTileWrapper
-            id={app.id}
-            type="app"
-            key={app.id}
-            itemRef={refs.items.current[app.id]}
-            {...tile}
-            {...app.shape.location}
-            {...app.shape.size}
-          >
-            <TileComponent className="grid-stack-item-content" app={app} />
-          </GridstackTileWrapper>
-        );
-      })}
-      {widgets.map((widget) => {
-        const definition = Widgets[widget.id as keyof typeof Widgets] as
-          | IWidgetDefinition
-          | undefined;
-        if (!definition) return null;
-
-        return (
-          <GridstackTileWrapper
-            type="widget"
-            key={widget.id}
-            itemRef={refs.items.current[widget.id]}
-            id={definition.id}
-            {...definition.gridstack}
-            {...widget.shape.location}
-            {...widget.shape.size}
-          >
-            <definition.component className="grid-stack-item-content" widget={widget} />
-          </GridstackTileWrapper>
-        );
-      })}
+      <WrapperContent apps={apps} refs={refs} widgets={widgets} />
     </div>
   );
 };
diff --git a/src/components/Dashboard/Wrappers/WrapperContent.tsx b/src/components/Dashboard/Wrappers/WrapperContent.tsx
new file mode 100644
index 000000000..c18053224
--- /dev/null
+++ b/src/components/Dashboard/Wrappers/WrapperContent.tsx
@@ -0,0 +1,60 @@
+import { GridStack } from 'fily-publish-gridstack';
+import { MutableRefObject, RefObject } from 'react';
+import { AppType } from '../../../types/app';
+import Widgets from '../../../widgets';
+import { IWidget, IWidgetDefinition } from '../../../widgets/widgets';
+import { Tiles } from '../Tiles/tilesDefinitions';
+import { GridstackTileWrapper } from '../Tiles/TileWrapper';
+
+interface WrapperContentProps {
+  apps: AppType[];
+  widgets: IWidget<string, any>[];
+  refs: {
+    wrapper: RefObject<HTMLDivElement>;
+    items: MutableRefObject<Record<string, RefObject<HTMLDivElement>>>;
+    gridstack: MutableRefObject<GridStack | undefined>;
+  };
+}
+
+export const WrapperContent = ({ apps, refs, widgets }: WrapperContentProps) => {
+  return (
+    <>
+      {apps?.map((app) => {
+        const { component: TileComponent, ...tile } = Tiles['app'];
+        return (
+          <GridstackTileWrapper
+            id={app.id}
+            type="app"
+            key={app.id}
+            itemRef={refs.items.current[app.id]}
+            {...tile}
+            {...app.shape.location}
+            {...app.shape.size}
+          >
+            <TileComponent className="grid-stack-item-content" app={app} />
+          </GridstackTileWrapper>
+        );
+      })}
+      {widgets.map((widget) => {
+        const definition = Widgets[widget.id as keyof typeof Widgets] as
+          | IWidgetDefinition
+          | undefined;
+        if (!definition) return null;
+
+        return (
+          <GridstackTileWrapper
+            type="widget"
+            key={widget.id}
+            itemRef={refs.items.current[widget.id]}
+            id={definition.id}
+            {...definition.gridstack}
+            {...widget.shape.location}
+            {...widget.shape.size}
+          >
+            <definition.component className="grid-stack-item-content" widget={widget} />
+          </GridstackTileWrapper>
+        );
+      })}
+    </>
+  );
+};
diff --git a/src/components/Dashboard/Wrappers/gridstack/use-gridstack.ts b/src/components/Dashboard/Wrappers/gridstack/use-gridstack.ts
index b75e0bede..f68c24e09 100644
--- a/src/components/Dashboard/Wrappers/gridstack/use-gridstack.ts
+++ b/src/components/Dashboard/Wrappers/gridstack/use-gridstack.ts
@@ -17,7 +17,7 @@ import { useEditModeStore } from '../../Views/useEditModeStore';
 import { initializeGridstack } from './init-gridstack';
 
 interface UseGristackReturnType {
-  items: AppType[];
+  apps: AppType[];
   widgets: IWidget<string, any>[];
   refs: {
     wrapper: RefObject<HTMLDivElement>;
@@ -211,7 +211,7 @@ export const useGridstack = (
   }, [items.length, wrapperRef.current, (widgets ?? []).length]);
 
   return {
-    items,
+    apps: items,
     widgets: widgets ?? [],
     refs: {
       items: itemRefs,
diff --git a/src/widgets/WidgetWrapper.tsx b/src/widgets/WidgetWrapper.tsx
new file mode 100644
index 000000000..5ccfe2d2b
--- /dev/null
+++ b/src/widgets/WidgetWrapper.tsx
@@ -0,0 +1,20 @@
+import { ReactNode } from 'react';
+import { HomarrCardWrapper } from '../components/Dashboard/Tiles/HomarrCardWrapper';
+import { WidgetsMenu } from '../components/Dashboard/Tiles/Widgets/WidgetsMenu';
+import { IWidget } from './widgets';
+
+interface WidgetWrapperProps {
+  widgetId: string;
+  widget: IWidget<string, any>;
+  className: string;
+  children: ReactNode;
+}
+
+export const WidgetWrapper = ({ widgetId, widget, className, children }: WidgetWrapperProps) => {
+  return (
+    <HomarrCardWrapper className={className}>
+      <WidgetsMenu integration={widgetId} widget={widget} />
+      {children}
+    </HomarrCardWrapper>
+  );
+};