diff --git a/app/Http/Controllers/Activity/FormController.php b/app/Http/Controllers/Activity/FormController.php
index f3b9cff..0ca57b3 100644
--- a/app/Http/Controllers/Activity/FormController.php
+++ b/app/Http/Controllers/Activity/FormController.php
@@ -95,6 +95,7 @@ class FormController implements HasMiddleware
         $allUnits = ReferenceUnit::rowActive()->get();
         $unitsMap = $allUnits->keyBy('code');
         $unitsByCategory = $allUnits->groupBy('category');
+        dd($unitsByCategory);
 
         // For Copy data feature
         // $availableYears = ActivityForm::select('inventory_year')->distinct()
diff --git a/resources/views/modules/form/form.blade.php b/resources/views/modules/form/form.blade.php
index 7504f5e..18aa16f 100644
--- a/resources/views/modules/form/form.blade.php
+++ b/resources/views/modules/form/form.blade.php
@@ -71,7 +71,12 @@
                                                         data-current-unit="{{ $unitCode }}">
                                                         @if (@$unitsByCategory[$unitCategory])
                                                             @foreach (@$unitsByCategory[$unitCategory] as $unit)
-                                                                
+                                                                @if($unit->code == $unitCode)
+                                                                    <option value="{{ $unit->code }}"
+                                                                        {{ $unit->code == $unitCode ? 'selected' : '' }}>
+                                                                        {{ $unit->code }}
+                                                                    </option>
+                                                                @endif
                                                             @endforeach
                                                         @endif
                                                     </select>