diff --git a/src/components/Event/FullAddressAutoComplete.vue b/src/components/Event/FullAddressAutoComplete.vue
index 48185b32c..83793a46f 100644
--- a/src/components/Event/FullAddressAutoComplete.vue
+++ b/src/components/Event/FullAddressAutoComplete.vue
@@ -63,6 +63,7 @@
             </template>
           </template>
         </o-autocomplete>
+        <slot></slot>
         <o-button
           :disabled="!queryTextWithDefault"
           @click="resetAddress"
diff --git a/src/components/Home/SearchFields.vue b/src/components/Home/SearchFields.vue
index c20315bb2..8739cecc3 100644
--- a/src/components/Home/SearchFields.vue
+++ b/src/components/Home/SearchFields.vue
@@ -28,12 +28,37 @@
       labelClass="sr-only"
       :placeholder="t('e.g. Nantes, Berlin, Cork, …')"
       v-on:update:modelValue="modelValueUpdate"
-    />
+    >
+      <o-button
+        v-if="distance"
+        class="!h-auto"
+        icon-left="map-marker-distance"
+        :title="t('Select distance')"
+        @click="showDistance = !showDistance"
+      />
+    </full-address-auto-complete>
     <o-button native-type="submit" icon-left="magnify">
       <template v-if="search">{{ t("Go!") }}</template>
       <template v-else>{{ t("Explore!") }}</template>
     </o-button>
   </form>
+  <div
+    class="border-black border-2 bg-white pt-1 pb-1 w-64 mx-auto"
+    v-if="showDistance"
+  >
+    <span class="mx-2 font-medium text-gray-900 dark:text-slate-100 text-left">
+      {{ t("Distance") }}
+    </span>
+    <select v-model="distance">
+      <option
+        v-for="distance_item in distanceList"
+        :value="distance_item.distance"
+        :key="distance_item.distance"
+      >
+        {{ distance_item.label }}
+      </option>
+    </select>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -44,7 +69,7 @@ import {
   getLocationFromLocal,
   storeLocationInLocal,
 } from "@/utils/location";
-import { computed, defineAsyncComponent } from "vue";
+import { computed, defineAsyncComponent, ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRouter, useRoute } from "vue-router";
 import RouteName from "@/router/name";
@@ -57,6 +82,7 @@ const props = defineProps<{
   location: IAddress | null;
   locationDefaultText?: string | null;
   search: string;
+  distance: number | null;
   fromLocalStorage?: boolean | false;
 }>();
 
@@ -66,6 +92,7 @@ const route = useRoute();
 const emit = defineEmits<{
   (event: "update:location", location: IAddress | null): void;
   (event: "update:search", newSearch: string): void;
+  (event: "update:distance", newDistance: number): void;
   (event: "submit"): void;
 }>();
 
@@ -96,21 +123,113 @@ const search = computed({
   },
 });
 
+const showDistance = ref(false);
+
+const distance = computed({
+  get(): number {
+    return props.distance;
+  },
+  set(newDistance: number) {
+    emit("update:distance", newDistance);
+    showDistance.value = false;
+  },
+});
+
+const distanceList = computed(() => {
+  return [
+    {
+      distance: 5,
+      label: t(
+        "{number} kilometers",
+        {
+          number: 5,
+        },
+        5
+      ),
+    },
+    {
+      distance: 10,
+      label: t(
+        "{number} kilometers",
+        {
+          number: 10,
+        },
+        10
+      ),
+    },
+    {
+      distance: 25,
+      label: t(
+        "{number} kilometers",
+        {
+          number: 25,
+        },
+        25
+      ),
+    },
+    {
+      distance: 50,
+      label: t(
+        "{number} kilometers",
+        {
+          number: 50,
+        },
+        50
+      ),
+    },
+    {
+      distance: 100,
+      label: t(
+        "{number} kilometers",
+        {
+          number: 100,
+        },
+        100
+      ),
+    },
+    {
+      distance: 150,
+      label: t(
+        "{number} kilometers",
+        {
+          number: 150,
+        },
+        150
+      ),
+    },
+  ];
+});
+
+console.debug("initial", distance.value, search.value, location.value);
+
 const modelValueUpdate = (newlocation: IAddress | null) => {
   emit("update:location", newlocation);
 };
 
 const submit = () => {
   emit("submit");
-  const { lat, lon } = addressToLocation(location.value);
+  const search_query = {
+    locationName: undefined,
+    lat: undefined,
+    lon: undefined,
+    search: search.value,
+    distance: undefined,
+  };
+  if (distance.value != null) {
+    search_query.distance = distance.value.toString() + "_km";
+  }
+  if (location.value) {
+    const { lat, lon } = addressToLocation(location.value);
+    search_query.locationName =
+      location.value.locality ?? location.value.region;
+    search_query.lat = lat;
+    search_query.lon = lon;
+  }
   router.push({
     name: RouteName.SEARCH,
     query: {
       ...route.query,
-      locationName: location.value?.locality ?? location.value?.region,
-      lat,
-      lon,
-      search: search.value,
+      ...search_query,
     },
   });
 };
diff --git a/src/components/Local/CloseEvents.vue b/src/components/Local/CloseEvents.vue
index f6cdfb580..03437d43b 100644
--- a/src/components/Local/CloseEvents.vue
+++ b/src/components/Local/CloseEvents.vue
@@ -97,6 +97,7 @@ import { EventSortField, SortDirection } from "@/types/enums";
 const props = defineProps<{
   userLocation: LocationType;
   doingGeoloc?: boolean;
+  distance: number | null;
 }>();
 defineEmits(["doGeoLoc"]);
 
@@ -112,9 +113,9 @@ const geoHash = computed(() => {
   return geo;
 });
 
-const distance = computed<number>(() =>
-  userLocation.value?.isIPLocation ? 150 : 25
-);
+const distance = computed<number>(() => {
+  return props.distance | 25;
+});
 
 const eventsQuery = useQuery<{
   searchEvents: Paginate<IEvent>;
diff --git a/src/components/core/MaterialIcon.vue b/src/components/core/MaterialIcon.vue
index 7d6d4ed63..22a3b4438 100644
--- a/src/components/core/MaterialIcon.vue
+++ b/src/components/core/MaterialIcon.vue
@@ -111,6 +111,10 @@ const icons: Record<string, () => Promise<any>> = {
   Map: () => import(`../../../node_modules/vue-material-design-icons/Map.vue`),
   MapMarker: () =>
     import(`../../../node_modules/vue-material-design-icons/MapMarker.vue`),
+  MapMarkerDistance: () =>
+    import(
+      `../../../node_modules/vue-material-design-icons/MapMarkerDistance.vue`
+    ),
   Close: () =>
     import(`../../../node_modules/vue-material-design-icons/Close.vue`),
   Magnify: () =>
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 5c45847c5..eb65cfad7 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -29,6 +29,7 @@
   <search-fields
     v-model:search="search"
     v-model:location="location"
+    v-model:distance="distance"
     :locationDefaultText="location?.description ?? userLocation?.name"
     v-on:update:location="updateLocation"
     :fromLocalStorage="true"
@@ -146,6 +147,7 @@
     @doGeoLoc="performGeoLocation()"
     :userLocation="userLocation"
     :doingGeoloc="doingGeoloc"
+    :distance="distance"
   />
 </template>
 
@@ -239,6 +241,7 @@ const currentUserParticipations = computed(
 const location = ref(null);
 const search = ref("");
 const noLocation = ref(false);
+const current_distance = ref(null);
 
 watch(location, (newLoc, oldLoc) =>
   console.debug("LOCATION UPDATED from", { ...oldLoc }, " to ", { ...newLoc })
@@ -451,6 +454,20 @@ const userLocation = computed(() => {
   return userSettingsLocation.value;
 });
 
+const distance = computed({
+  get(): number | null {
+    if (noLocation.value) {
+      return null;
+    } else if (current_distance.value == null) {
+      return userLocation.value?.isIPLocation ? 150 : 25;
+    }
+    return current_distance.value;
+  },
+  set(newDistance: number) {
+    current_distance.value = newDistance;
+  },
+});
+
 const { mutate: saveCurrentUserLocation } = useMutation<any, LocationType>(
   UPDATE_CURRENT_USER_LOCATION_CLIENT
 );