diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
index e37906ed1..dec445f12 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
@@ -61,9 +61,10 @@ export const ViewPickerOptionDropdown = ({
   const handleAddToFavorites = () => {
     if (!isFavorite) {
       createFavorite(view, 'view');
+    } else {
+      setViewPickerReferenceViewId(view.id);
+      setViewPickerMode('favorite-folders-picker');
     }
-    setViewPickerReferenceViewId(view.id);
-    setViewPickerMode('favorite-folders-picker');
     closeDropdown();
   };