diff --git a/components/Location.tsx b/components/Location.tsx
index ad14bfa..a9222eb 100644
--- a/components/Location.tsx
+++ b/components/Location.tsx
@@ -36,7 +36,7 @@ const LocationScreen: React.FC<LocationScreenProps> = ({ visible, currentTheme,
     const [locLoading, setLocLoading] = useState(false);
     const [parks, setParks] = useState<Park[]>([]);
     const [hasSearched, setHasSearched] = useState(false);
-    const [selectedParkId, setSelectedParkId] = useState<string | null>(null);
+    const [selectedPark, setSelectedPark] = useState<Park | null>(null);
 
     // Call the parks endpoint with coordinates
     const fetchNearbyParks = async (longitude: number, latitude: number) => {
@@ -104,15 +104,14 @@ const LocationScreen: React.FC<LocationScreenProps> = ({ visible, currentTheme,
             }}
             titleStyle={{ fontWeight: "bold" }}
             descriptionNumberOfLines={2}
-            onPress={() => setSelectedParkId(item.Id)}
+            onPress={() => {
+                setSelectedPark(item);
+                setParks([]);
+                setHasSearched(false);
+            }}
         />
     );
 
-    // Find the selected park, if one is selected
-    const selectedPark = selectedParkId
-        ? parks.find(p => p.Id === selectedParkId)
-        : null;
-
     return (
         <Portal>
             <Dialog
@@ -144,7 +143,11 @@ const LocationScreen: React.FC<LocationScreenProps> = ({ visible, currentTheme,
                                 />
                                 <Button
                                     mode="outlined"
-                                    onPress={() => setSelectedParkId(null)}
+                                    onPress={() => {
+                                        setSelectedPark(null);
+                                        setParks([]);
+                                        setHasSearched(false);
+                                    }}
                                     style={{ marginTop: 16, width: "100%" }}
                                 >
                                     Change Park