diff --git a/src/components/config/GitHubConfigForm.tsx b/src/components/config/GitHubConfigForm.tsx
index 6b934a7..351b72c 100644
--- a/src/components/config/GitHubConfigForm.tsx
+++ b/src/components/config/GitHubConfigForm.tsx
@@ -130,14 +130,11 @@ export function GitHubConfigForm({
             >
               GitHub Token
             </label>
-            <HoverCard>
+            <HoverCard openDelay={200}>
               <HoverCardTrigger asChild>
-                <button
-                  type="button"
-                  className="p-0.5 hover:bg-muted rounded-sm transition-colors cursor-help"
-                >
+                <span className="inline-flex p-0.5 hover:bg-muted rounded-sm transition-colors cursor-help">
                   <Info className="h-3.5 w-3.5 text-muted-foreground" />
-                </button>
+                </span>
               </HoverCardTrigger>
               <HoverCardContent side="right" align="start" className="w-80">
                 <div className="space-y-2">
diff --git a/src/components/config/OrganizationStrategy.tsx b/src/components/config/OrganizationStrategy.tsx
index 20e0dbb..52d470d 100644
--- a/src/components/config/OrganizationStrategy.tsx
+++ b/src/components/config/OrganizationStrategy.tsx
@@ -275,15 +275,14 @@ export const OrganizationStrategy: React.FC<OrganizationStrategyProps> = ({
                           </p>
                         </div>
                         
-                        <HoverCard>
+                        <HoverCard openDelay={200}>
                           <HoverCardTrigger asChild>
-                            <button 
-                              type="button"
-                              className="p-1.5 hover:bg-muted rounded-md transition-colors cursor-help"
+                            <span 
+                              className="inline-flex p-1.5 hover:bg-muted rounded-md transition-colors cursor-help"
                               onClick={(e) => e.stopPropagation()}
                             >
                               <Info className="h-4 w-4 text-muted-foreground" />
-                            </button>
+                            </span>
                           </HoverCardTrigger>
                           <HoverCardContent side="left" align="center" className="w-[500px]">
                             <div className="space-y-3">