diff --git a/resources/views/components/habits/createOrUpdate.blade.php b/resources/views/components/habits/createOrUpdate.blade.php
index 9d69e34..3ad75d4 100644
--- a/resources/views/components/habits/createOrUpdate.blade.php
+++ b/resources/views/components/habits/createOrUpdate.blade.php
@@ -121,7 +121,6 @@ class="inline-block w-fit border-gray-300 dark:border-gray-700 dark:bg-gray-900
                     <x-text-input type="date" class="inline-block mt-1" name="schedule_start" id="schedule_start"
                                   :value="old('schedule_start', isset($habit->schedule_start) ? $habit->schedule_start : $today)"
                                   required/>
-
                 </div>
             </x-pagecard>
 
@@ -136,19 +135,19 @@ class="inline-block w-fit border-gray-300 dark:border-gray-700 dark:bg-gray-900
                     </div>
                     <div class="flex items-center mb-1">
                         <input id="goal-type-1" type="radio" value="none" name="goal_type"
-                               onclick="toggleGoalSchedule(true)" checked
+                               onclick="toggleGoalSchedule(true)" @if($habit->goal_type === 'none') checked @elseif(!isset($habit->goal_type)) checked @endif
                                class="w-4 h-4 text-blue-600 bg-gray-50 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
                         <label for="goal-type-1" class="ml-2">No goal</label>
                     </div>
                     <div class="flex items-center mb-1">
                         <input id="goal-type-2" type="radio" value="schedule" name="goal_type"
-                               onclick="toggleGoalSchedule(true)"
+                               onclick="toggleGoalSchedule(true)" @if($habit->goal_type === 'schedule') checked @endif
                                class="w-4 h-4 text-blue-600 bg-gray-50 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
                         <label for="goal-type-2" class="ml-2 ">Same as schedule</label>
                     </div>
                     <div class="flex items-center mb-1">
                         <input id="goal-type-3" type="radio" value="custom" name="goal_type"
-                               onclick="toggleGoalSchedule(false)"
+                               onclick="toggleGoalSchedule(false)" @if($habit->goal_type === 'custom') checked @endif
                                class="w-4 h-4 text-blue-600 bg-gray-50 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
                         <label for="goal-type-3" class="ml-2 ">Custom schedule</label>
                     </div>