diff --git a/src/pages/Index.tsx b/src/pages/Index.tsx
index 916b75d..067af4b 100644
--- a/src/pages/Index.tsx
+++ b/src/pages/Index.tsx
@@ -16,7 +16,7 @@ import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, Command
 import { RichTextEditor } from "@/components/RichTextEditor";
 import {
   PlusCircle, Search, User, LogOut, Settings, ChevronDown, Plus, Archive, Trash2,
-  Image as ImageIcon, CheckSquare, FileText, Rss, ExternalLink, RefreshCw, Key, Zap, Paperclip, X, Edit, Calendar as CalendarIcon, Tag as TagIcon, MessageSquare, Send, Check, ChevronsUpDown, Star, Activity, FileDown, LayoutGrid, List, Sparkles, BarChart3, Clock
+  Image as ImageIcon, CheckSquare, FileText, Rss, ExternalLink, RefreshCw, Key, Zap, Paperclip, X, Edit, Calendar as CalendarIcon, Tag as TagIcon, MessageSquare, Send, Check, ChevronsUpDown, Star, Activity, FileDown, LayoutGrid, List, Sparkles, BarChart3, Clock, HelpCircle
 } from "lucide-react";
 import AuthService from "@/services/AuthService";
 import AdminService from "@/services/AdminService";
@@ -1016,12 +1016,6 @@ const Index = () => {
       },
       preventDefault: false
     },
-    {
-      key: '?',
-      shift: true,
-      description: 'Aide raccourcis',
-      handler: () => setShowKeyboardHelp(true)
-    },
     {
       key: 'e',
       ctrl: true,
@@ -1158,6 +1152,15 @@ const Index = () => {
                 )}
               </Button>
 
+              <Button
+                variant="ghost"
+                size="icon"
+                onClick={() => setShowKeyboardHelp(true)}
+                title="Aide - Raccourcis clavier"
+              >
+                <HelpCircle className="h-5 w-5" />
+              </Button>
+
               <ModeToggle />
 
               {user && (
@@ -3378,13 +3381,22 @@ const Index = () => {
         todos={todos}
       />
 
-      {/* Pomodoro Timer Modal */}
-      <PomodoroModal
-        open={showPomodoroModal}
-        onOpenChange={setShowPomodoroModal}
-      >
+      {/* Pomodoro Timer - Always mounted in hidden div to keep timer running */}
+      <div style={{ position: 'absolute', left: '-9999px', top: '-9999px' }}>
         <PomodoroTimer onStateChange={handlePomodoroStateChange} />
-      </PomodoroModal>
+      </div>
+
+      {/* Pomodoro Timer Modal - Shows timer controls when opened */}
+      <Dialog open={showPomodoroModal} onOpenChange={setShowPomodoroModal}>
+        <DialogContent className="max-w-md">
+          <DialogHeader>
+            <DialogTitle className="text-2xl">Pomodoro Timer</DialogTitle>
+          </DialogHeader>
+          <div className="mt-4">
+            <PomodoroTimer onStateChange={handlePomodoroStateChange} />
+          </div>
+        </DialogContent>
+      </Dialog>
 
       {/* Quick Capture Widget */}
       <QuickCaptureWidget onNoteCaptured={loadNotes} />