diff --git a/client/src/Components/v2/common/index.ts b/client/src/Components/v2/common/index.ts
index d0d1262b7..2ea3bf3f7 100644
--- a/client/src/Components/v2/common/index.ts
+++ b/client/src/Components/v2/common/index.ts
@@ -2,5 +2,4 @@ export * from "../common/charts/HistogramResponseTime";
 export * from "../common/charts/HeatmapResponseTime";
 export * from "../common/charts/HeatmapResponseTimeTooltip";
 export * from "../common/controls/HeaderCreate";
-export * from "../common/controls/HeaderMonitorControls";
 export * from "../common/controls/HeaderTimeRange";
diff --git a/client/src/Components/v2/common/controls/HeaderMonitorControls.tsx b/client/src/Components/v2/monitors/HeaderMonitorControls.tsx
similarity index 100%
rename from client/src/Components/v2/common/controls/HeaderMonitorControls.tsx
rename to client/src/Components/v2/monitors/HeaderMonitorControls.tsx
diff --git a/client/src/Components/v2/monitors/index.tsx b/client/src/Components/v2/monitors/index.tsx
index ce90f1b8c..e2856d6a9 100644
--- a/client/src/Components/v2/monitors/index.tsx
+++ b/client/src/Components/v2/monitors/index.tsx
@@ -1,5 +1,6 @@
 export * from "./ControlsFilter";
 export * from "./MonitorStatBoxes";
+export * from "./HeaderMonitorControls";
 export * from "./charts/HistogramStatus";
 export * from "./charts/RadialAvgResponse";
 export * from "./charts/HistogramDetails";
diff --git a/client/src/Pages/CreateMonitor/index.tsx b/client/src/Pages/CreateMonitor/index.tsx
index 874b780f4..d670fe41e 100644
--- a/client/src/Pages/CreateMonitor/index.tsx
+++ b/client/src/Pages/CreateMonitor/index.tsx
@@ -14,7 +14,7 @@ import Link from "@mui/material/Link";
 import Divider from "@mui/material/Divider";
 import IconButton from "@mui/material/IconButton";
 import { Trash2 } from "lucide-react";
-import { HeaderDeleteControls } from "@/Components/v2/common";
+import { HeaderDeleteControls } from "@/Components/v2/monitors";
 
 import { BasePage, ConfigBox } from "@/Components/v2/design-elements";
 import {
diff --git a/client/src/Pages/Infrastructure/Details/index.tsx b/client/src/Pages/Infrastructure/Details/index.tsx
index 42be78a63..036375b8b 100644
--- a/client/src/Pages/Infrastructure/Details/index.tsx
+++ b/client/src/Pages/Infrastructure/Details/index.tsx
@@ -1,6 +1,6 @@
 import { BasePage, Tab, Tabs } from "@/Components/v2/design-elements";
-import { HeaderMonitorControls, HeaderTimeRange } from "@/Components/v2/common";
-import { MonitorStatBoxes } from "@/Components/v2/monitors";
+import { HeaderTimeRange } from "@/Components/v2/common";
+import { MonitorStatBoxes, HeaderMonitorControls } from "@/Components/v2/monitors";
 import { TabNetwork } from "@/Pages/Infrastructure/Details/Components/TabNetwork";
 import { TabOverview } from "@/Pages/Infrastructure/Details/Components/TabOverview";
 
diff --git a/client/src/Pages/PageSpeed/Details/index.tsx b/client/src/Pages/PageSpeed/Details/index.tsx
index f1e4df4ba..3be3a245b 100644
--- a/client/src/Pages/PageSpeed/Details/index.tsx
+++ b/client/src/Pages/PageSpeed/Details/index.tsx
@@ -1,12 +1,12 @@
 import { BasePage } from "@/Components/v2/design-elements";
 import type { PageSpeedDetailsResponse } from "@/Types/Monitor";
-import { HeaderMonitorControls } from "@/Components/v2/common";
 import Stack from "@mui/material/Stack";
 import {
 	HistogramPageSpeedDetails,
 	PiePageSpeed,
 	PiePageSpeedLegend,
 	MonitorStatBoxes,
+	HeaderMonitorControls,
 } from "@/Components/v2/monitors";
 
 import { useIsAdmin } from "@/Hooks/useIsAdmin";
diff --git a/client/src/Pages/Uptime/Details/index.tsx b/client/src/Pages/Uptime/Details/index.tsx
index f32ae1989..29c9f74db 100644
--- a/client/src/Pages/Uptime/Details/index.tsx
+++ b/client/src/Pages/Uptime/Details/index.tsx
@@ -1,10 +1,11 @@
 import { BasePage } from "@/Components/v2/design-elements";
-import { HeaderMonitorControls, HeaderTimeRange } from "@/Components/v2/common";
+import { HeaderTimeRange } from "@/Components/v2/common";
 import Stack from "@mui/material/Stack";
 import {
 	HistogramStatus,
 	RadialAvgResponse,
 	HistogramDetails,
+	HeaderMonitorControls,
 } from "@/Components/v2/monitors";
 import { TrendingUp, AlertTriangle } from "lucide-react";
 import { ChecksTable } from "@/Pages/Uptime/Details/Components/ChecksTable";