diff --git a/frontend/components/Task/TaskHeader.tsx b/frontend/components/Task/TaskHeader.tsx
index bd425ce..039cd11 100644
--- a/frontend/components/Task/TaskHeader.tsx
+++ b/frontend/components/Task/TaskHeader.tsx
@@ -183,7 +183,7 @@ const TaskHeader: React.FC<TaskHeaderProps> = ({
             {/* Full view (md and larger) */}
             <div className="hidden md:flex flex-col md:flex-row md:items-center md:relative">
                 <div
-                    className={`flex items-center space-x-3 mb-2 md:mb-0 flex-1 min-w-0 ${!isUpcomingView ? 'pr-44' : ''}`}
+                    className={`flex items-center space-x-3 mb-2 md:mb-0 flex-1 min-w-0 ${!isUpcomingView ? 'pr-56' : ''}`}
                 >
                     <div className="hidden">
                         <TaskPriorityIcon
@@ -293,19 +293,19 @@ const TaskHeader: React.FC<TaskHeaderProps> = ({
                                 )}
                             </div>
                         ) : (
-                            <div className="flex items-center gap-1.5 min-w-0 flex-1">
-                                <div className="flex items-center gap-1.5 flex-1 min-w-0">
-                                    {task.habit_mode && (
-                                        <FireIcon
-                                            className="h-4 w-4 text-orange-500 flex-shrink-0"
-                                            title="Habit"
-                                        />
-                                    )}
-                                    <span className="text-md font-medium text-gray-900 dark:text-gray-300 truncate">
-                                        {task.original_name || task.name}
-                                    </span>
+                            <div className="flex items-center gap-1.5 flex-1 min-w-0">
+                                {task.habit_mode && (
+                                    <FireIcon
+                                        className="h-4 w-4 text-orange-500 flex-shrink-0"
+                                        title="Habit"
+                                    />
+                                )}
+                                <span className="text-md font-medium text-gray-900 dark:text-gray-300 truncate">
+                                    {task.original_name || task.name}
+                                </span>
+                                <div className="flex-shrink-0">
+                                    <SubtasksToggleButton />
                                 </div>
-                                <SubtasksToggleButton />
                             </div>
                         )}
                         {/* Project, tags, due date, and recurrence in same row, with spacing when they exist */}