diff --git a/src/renderer/src/pages/home/Inputbar/InputbarTools.tsx b/src/renderer/src/pages/home/Inputbar/InputbarTools.tsx
index 2dc5ee88a9..1b56b37eb4 100644
--- a/src/renderer/src/pages/home/Inputbar/InputbarTools.tsx
+++ b/src/renderer/src/pages/home/Inputbar/InputbarTools.tsx
@@ -261,9 +261,12 @@ const InputbarTools = ({ scope, assistantId, session }: InputbarToolsNewProps) =
     const sourceId = source.droppableId
     const destinationId = destination.droppableId
 
+    const visibleKeys = visibleTools.map((t) => t.key)
+    const hiddenKeys = hiddenTools.map((t) => t.key)
+
     const newToolOrder: ToolOrderConfig = {
-      visible: [...toolOrder.visible],
-      hidden: [...toolOrder.hidden]
+      visible: [...visibleKeys],
+      hidden: [...hiddenKeys]
     }
 
     const sourceArray = sourceId === 'inputbar-tools-visible' ? 'visible' : 'hidden'