diff --git a/packages/ui/src/components/chat/ModelControls.tsx b/packages/ui/src/components/chat/ModelControls.tsx
index 476a2e61..4dc8117f 100644
--- a/packages/ui/src/components/chat/ModelControls.tsx
+++ b/packages/ui/src/components/chat/ModelControls.tsx
@@ -522,7 +522,7 @@ export const ModelControls: React.FC<ModelControlsProps> = ({
     // currentProviderId/currentModelId; include providers to avoid stale variants.
     const availableVariants = React.useMemo(() => {
         return getCurrentModelVariants();
-    }, [getCurrentModelVariants, currentProviderId, currentModelId, providers]);
+    }, [getCurrentModelVariants]);
     const hasVariants = availableVariants.length > 0;
 
     const costRows = [
diff --git a/packages/ui/src/components/views/FilesView.tsx b/packages/ui/src/components/views/FilesView.tsx
index 6545ca63..83849d1f 100644
--- a/packages/ui/src/components/views/FilesView.tsx
+++ b/packages/ui/src/components/views/FilesView.tsx
@@ -56,7 +56,6 @@ import {
 import { useDebouncedValue } from '@/hooks/useDebouncedValue';
 import { useFileSearchStore } from '@/stores/useFileSearchStore';
 import { useDeviceInfo } from '@/lib/device';
-import { useLongPress } from '@/hooks/useLongPress';
 import { cn, getModifierLabel, hasModifier } from '@/lib/utils';
 import { getLanguageFromExtension, getImageMimeType, isImageFile } from '@/lib/toolHelpers';
 import { useRuntimeAPIs } from '@/hooks/useRuntimeAPIs';
@@ -427,16 +426,10 @@ const FileRow: React.FC<FileRowProps> = ({
     }
   }, [isDir, node, onSelect, onToggle]);
 
-  const longPressHandlers = useLongPress({
-    onLongPress: handleContextMenu,
-    onTap: handleInteraction,
-    enableHaptic: true,
-  });
-
-  const interactionProps = isMobile ? longPressHandlers : {
-    onClick: handleInteraction,
-    onContextMenu: handleContextMenu,
-  };
+  const handleMenuButtonClick = React.useCallback((event: React.MouseEvent) => {
+    event.stopPropagation();
+    setContextMenuPath(node.path);
+  }, [node.path, setContextMenuPath]);
 
   return (
     <div
@@ -445,7 +438,8 @@ const FileRow: React.FC<FileRowProps> = ({
     >
       <button
         type="button"
-        {...interactionProps}
+        onClick={handleInteraction}
+        onContextMenu={!isMobile ? handleContextMenu : undefined}
         className={cn(
           'flex w-full items-center gap-1.5 rounded-md px-2 py-1 text-left text-foreground transition-colors pr-8 select-none',
           isActive ? 'bg-interactive-selection/70' : 'hover:bg-interactive-hover/40'
@@ -478,27 +472,25 @@ const FileRow: React.FC<FileRowProps> = ({
       </button>
       {(canRename || canCreateFile || canCreateFolder || canDelete) && (
         <div className={cn(
-          "absolute right-1 top-1/2 -translate-y-1/2 opacity-0 focus-within:opacity-100",
-          !isMobile && "group-hover:opacity-100",
-          (isMobile && contextMenuPath === node.path) && "opacity-100"
+          "absolute right-1 top-1/2 -translate-y-1/2",
+          !isMobile && "opacity-0 focus-within:opacity-100 group-hover:opacity-100",
+          isMobile && "opacity-100"
         )}>
           <DropdownMenu
             open={contextMenuPath === node.path}
             onOpenChange={(open) => setContextMenuPath(open ? node.path : null)}
           >
-            {!isMobile && (
-              <DropdownMenuTrigger asChild>
-                <Button variant="ghost" size="icon" className="h-6 w-6">
-                  <RiMore2Fill className="h-4 w-4" />
-                </Button>
-              </DropdownMenuTrigger>
-            )}
-            {isMobile && (
-              <DropdownMenuTrigger asChild>
-                <span className="hidden" />
-              </DropdownMenuTrigger>
-            )}
-            <DropdownMenuContent align="end" onCloseAutoFocus={() => setContextMenuPath(null)}>
+            <DropdownMenuTrigger asChild>
+              <Button 
+                variant="ghost" 
+                size="icon" 
+                className="h-6 w-6"
+                onClick={handleMenuButtonClick}
+              >
+                <RiMore2Fill className="h-4 w-4" />
+              </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end" side={isMobile ? "bottom" : "bottom"} onCloseAutoFocus={() => setContextMenuPath(null)}>
               {canRename && (
                 <DropdownMenuItem onClick={(e) => { e.stopPropagation(); onOpenDialog('rename', node); }}>
                   <RiEditLine className="mr-2 h-4 w-4" /> Rename