diff --git a/frontend/src/components/RecipeDetails.jsx b/frontend/src/components/RecipeDetails.jsx
index a24e33c..af76b0b 100644
--- a/frontend/src/components/RecipeDetails.jsx
+++ b/frontend/src/components/RecipeDetails.jsx
@@ -48,8 +48,8 @@ function RecipeDetails({ recipe, onEditClick, onDeleteClick, onShowDeleteModal,
           <p className="recipe-subtitle">
             {translateMealType(recipe.meal_type)} · {recipe.time_minutes} דקות הכנה
           </p>
-          {(recipe.owner_display_name || recipe.made_by) && (
-            <h4 className="recipe-made-by">המתכון של: {recipe.owner_display_name || recipe.made_by}</h4>
+          {(recipe.made_by || recipe.owner_display_name) && (
+            <h4 className="recipe-made-by">המתכון של: {recipe.made_by || recipe.owner_display_name}</h4>
           )}
         </div>
         <div className="pill-row">
diff --git a/frontend/src/components/RecipeFormDrawer.jsx b/frontend/src/components/RecipeFormDrawer.jsx
index 860a5d7..45a5d35 100644
--- a/frontend/src/components/RecipeFormDrawer.jsx
+++ b/frontend/src/components/RecipeFormDrawer.jsx
@@ -216,6 +216,12 @@ function RecipeFormDrawer({ open, onClose, onSubmit, editingRecipe = null, curre
                     ref={idx === ingredients.length - 1 ? lastIngredientRef : null}
                     value={val}
                     onChange={(e) => handleChangeIngredient(idx, e.target.value)}
+                    onKeyDown={(e) => {
+                      if (e.key === 'Enter') {
+                        e.preventDefault();
+                        handleAddIngredient();
+                      }
+                    }}
                     placeholder="למשל: 2 ביצים"
                   />
                   <button
@@ -246,6 +252,12 @@ function RecipeFormDrawer({ open, onClose, onSubmit, editingRecipe = null, curre
                     ref={idx === steps.length - 1 ? lastStepRef : null}
                     value={val}
                     onChange={(e) => handleChangeStep(idx, e.target.value)}
+                    onKeyDown={(e) => {
+                      if (e.key === 'Enter') {
+                        e.preventDefault();
+                        handleAddStep();
+                      }
+                    }}
                     placeholder="למשל: לחמם את התנור ל־180 מעלות"
                   />
                   <button
diff --git a/frontend/src/components/RecipeSearchList.jsx b/frontend/src/components/RecipeSearchList.jsx
index 5e1045c..0b2d111 100644
--- a/frontend/src/components/RecipeSearchList.jsx
+++ b/frontend/src/components/RecipeSearchList.jsx
@@ -39,11 +39,16 @@ function RecipeSearchList({
   // Extract unique meal types from ALL recipes (not filtered)
   const mealTypes = Array.from(new Set(allRecipes.map((r) => r.meal_type))).sort();
 
-  // Extract unique made_by (username) from ALL recipes and map to display names
+  // Extract unique made_by values from ALL recipes
+  // The made_by field is what the user defined when creating the recipe,
+  // so we use it for both filtering and display
   const madeByMap = new Map();
   allRecipes.forEach((r) => {
-    if (r.made_by && r.owner_display_name) {
-      madeByMap.set(r.made_by, r.owner_display_name);
+    if (r.made_by) {
+      // Always use made_by as the display name (it's the custom name the user entered)
+      if (!madeByMap.has(r.made_by)) {
+        madeByMap.set(r.made_by, r.made_by);
+      }
     }
   });
   const allMadeBy = Array.from(madeByMap.keys()).sort();