diff --git a/frontend/src/components/ItineraryTimeline.tsx b/frontend/src/components/ItineraryTimeline.tsx
index 1d4d6ed..d99315e 100644
--- a/frontend/src/components/ItineraryTimeline.tsx
+++ b/frontend/src/components/ItineraryTimeline.tsx
@@ -460,7 +460,7 @@ export const ItineraryTimeline = ({
                                       Thực tế: {format(parseISO(location.actualStart), 'HH:mm')}
                                     </div>
                                   )}
-                                  {canEdit && !isStartPoint && !isEndPoint && ( // Only show edit/delete if canEdit
+                                  {canEdit && ( // Allow editing and deleting of all locations if user has edit permissions
                                     <div className="flex gap-1 mt-2">
                                       <button onClick={() => onEditLocation?.(location)} className="p-1 text-gray-400 hover:text-blue-600 transition-colors">
                                         <Edit2 className="w-3.5 h-3.5" />
diff --git a/frontend/src/pages/TourDetailPage.tsx b/frontend/src/pages/TourDetailPage.tsx
index fd69ee4..1856980 100644
--- a/frontend/src/pages/TourDetailPage.tsx
+++ b/frontend/src/pages/TourDetailPage.tsx
@@ -1026,8 +1026,13 @@ export const TourDetailPage = ({
                   setEditingLocation(loc);
                   setTargetLegId(loc.legId);
                   setMapCenter([loc.latitude, loc.longitude]);
-                  setIsStartPointAction(false);
-                  setIsEndPointAction(false);
+                  
+                  // Kiểm tra xem địa điểm đang sửa có phải là điểm mốc đặc biệt không (dựa trên timestamp 1970)
+                  const isStart = loc.plannedStart && new Date(loc.plannedStart).getTime() === 0;
+                  const isEnd = loc.plannedEnd && new Date(loc.plannedEnd).getTime() === 0;
+                  setIsStartPointAction(!!isStart);
+                  setIsEndPointAction(!!isEnd);
+                  
                   setIsAddLocationOpen(true);
                 }} 
                 onQuickNote={(locName: string) => handleQuickNote(locName)}