diff --git a/lib/towerops_web/live/org/gaiia_mapping_live.ex b/lib/towerops_web/live/org/gaiia_mapping_live.ex
index 1543a9d2..14e83c87 100644
--- a/lib/towerops_web/live/org/gaiia_mapping_live.ex
+++ b/lib/towerops_web/live/org/gaiia_mapping_live.ex
@@ -199,8 +199,11 @@ defmodule ToweropsWeb.Org.GaiiaMappingLive do
         if matches == [], do: acc, else: Map.put(acc, site.gaiia_id, matches)
       end)
 
+    # Sort items with suggestions first
+    sorted_sites = Enum.sort_by(sites, fn site -> if Map.has_key?(suggestions, site.gaiia_id), do: 0, else: 1 end)
+
     socket
-    |> assign(:items, sites)
+    |> assign(:items, sorted_sites)
     |> assign(:suggestions, suggestions)
   end
 
@@ -217,8 +220,11 @@ defmodule ToweropsWeb.Org.GaiiaMappingLive do
         if matches == [], do: acc, else: Map.put(acc, item.gaiia_id, matches)
       end)
 
+    # Sort items with suggestions first
+    sorted_items = Enum.sort_by(items, fn item -> if Map.has_key?(suggestions, item.gaiia_id), do: 0, else: 1 end)
+
     socket
-    |> assign(:items, items)
+    |> assign(:items, sorted_items)
     |> assign(:suggestions, suggestions)
   end