diff --git a/src/features/tasks/components/data-filters.tsx b/src/features/tasks/components/data-filters.tsx
index 5ef74d2..95f377c 100644
--- a/src/features/tasks/components/data-filters.tsx
+++ b/src/features/tasks/components/data-filters.tsx
@@ -34,9 +34,10 @@ interface DataFiltersProps {
   showMyTasksOnly?: boolean; // New prop to hide assignee filter in My Tasks
   projects?: Project[]; // Passed in My Space mode for cross-workspace filters
   disableManageColumns?: boolean; // Disable when project setup is needed
+  hideManageColumns?: boolean; // Hide entirely (e.g. calendar view)
 }
 
-export const DataFilters = ({ hideProjectFilter, showMyTasksOnly, projects: passedProjects, disableManageColumns }: DataFiltersProps) => {
+export const DataFilters = ({ hideProjectFilter, showMyTasksOnly, projects: passedProjects, disableManageColumns, hideManageColumns }: DataFiltersProps) => {
   const workspaceId = useWorkspaceId();
   const currentProjectId = useProjectId();
 
@@ -303,16 +304,18 @@ export const DataFilters = ({ hideProjectFilter, showMyTasksOnly, projects: pass
         />
       </div>
 
-      <Button
-        size="sm"
-        onClick={openManageModal}
-        disabled={disableManageColumns}
-        title={disableManageColumns ? "Complete project setup in Backlog first" : undefined}
-        className="h-8 text-xs lg:ml-auto gap-2"
-      >
-        <Settings2Icon className="size-4 mr-2" />
-        Manage Columns
-      </Button>
+      {!hideManageColumns && (
+        <Button
+          size="sm"
+          onClick={openManageModal}
+          disabled={disableManageColumns}
+          title={disableManageColumns ? "Complete project setup in Backlog first" : undefined}
+          className="h-8 text-xs lg:ml-auto gap-2"
+        >
+          <Settings2Icon className="size-4 mr-2" />
+          Manage Columns
+        </Button>
+      )}
     </div>
   );
 };
diff --git a/src/features/tasks/components/task-view-switcher.tsx b/src/features/tasks/components/task-view-switcher.tsx
index 63ae479..17f3b1d 100644
--- a/src/features/tasks/components/task-view-switcher.tsx
+++ b/src/features/tasks/components/task-view-switcher.tsx
@@ -493,6 +493,7 @@ export const TaskViewSwitcher = ({
           showMyTasksOnly={showMyTasksOnly}
           projects={showMyTasksOnly ? (mySpaceProjectsQuery.data?.documents || []) : undefined}
           disableManageColumns={effectiveProjectId ? setupState.needsSetup : false}
+          hideManageColumns={view === "calendar"}
         />
       )}