diff --git a/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx b/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
index 80a0c500..a85c4702 100644
--- a/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
@@ -91,9 +91,10 @@ export const TaskDialog = ({
           data-testid={`task-row-${task.id}`}
           id={`task-row-${task.id}`}
           key={index}
-          className={`border-b cursor-pointer ${
-            selectedIndex === index ? 'bg-muted/50' : ''
+          className={`border-b cursor-pointer hover:dark:bg-muted/50 hover:bg-black/15 ${
+            selectedIndex === index ? 'dark:bg-muted/50 bg-black/15' : ''
           }`}
+          data-selected={selectedIndex === index}
           onClick={() => {
             onSelectTask(task, index);
           }}
diff --git a/frontend/src/components/HomeComponents/Tasks/Tasks.tsx b/frontend/src/components/HomeComponents/Tasks/Tasks.tsx
index 5043fba0..808773ac 100644
--- a/frontend/src/components/HomeComponents/Tasks/Tasks.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/Tasks.tsx
@@ -151,6 +151,7 @@ export const Tasks = (
         target instanceof HTMLTextAreaElement ||
         target instanceof HTMLSelectElement ||
         _isDialogOpen ||
+        isAddTaskOpen ||
         target.isContentEditable
       ) {
         return;
diff --git a/frontend/src/components/HomeComponents/Tasks/__tests__/TaskDialog.test.tsx b/frontend/src/components/HomeComponents/Tasks/__tests__/TaskDialog.test.tsx
index acb52c8b..8961e98e 100644
--- a/frontend/src/components/HomeComponents/Tasks/__tests__/TaskDialog.test.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/__tests__/TaskDialog.test.tsx
@@ -609,19 +609,16 @@ describe('TaskDialog Component', () => {
 
   describe('Selected State', () => {
     test('should highlight selected task row', () => {
-      const { container } = render(
-        <TaskDialog {...defaultProps} selectedIndex={0} />
-      );
+      render(<TaskDialog {...defaultProps} selectedIndex={0} />);
 
-      const taskRow = container.querySelector('.bg-muted\\/50');
-      expect(taskRow).toBeInTheDocument();
+      const taskRow = screen.getByText(mockTask.description).closest('tr');
+      expect(taskRow).toHaveAttribute('data-selected', 'true');
     });
 
     test('should not highlight non-selected task row', () => {
       render(<TaskDialog {...defaultProps} selectedIndex={1} />);
-
       const taskRow = screen.getByText(mockTask.description).closest('tr');
-      expect(taskRow).not.toHaveClass('bg-muted/50');
+      expect(taskRow).toHaveAttribute('data-selected', 'false');
     });
   });