diff --git a/templates/base.html b/templates/base.html
index 5009f0c..02bf182 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -196,6 +196,7 @@
     /* Form groups */
     .form-group    { margin-bottom: 1.2rem; }
     .form-group-lg { margin-bottom: 1.5rem; }
+    #return-date-group:has(input:disabled) { cursor: pointer; }
 
     /* Buttons */
     .btn-primary {
diff --git a/templates/index.html b/templates/index.html
index 655d415..3a3317f 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -70,13 +70,13 @@
         class="form-control">
     </div>
 
-    <div class="form-group-lg">
+    <div class="form-group-lg" id="return-date-group">
       <label for="return_date" class="field-label">
         Return date
       </label>
       <input type="date" id="return_date" name="return_date"
         min="{{ today }}" value="{{ default_return_date }}"
-        class="form-control">
+        class="form-control" disabled>
     </div>
 
     <div class="form-group">
@@ -108,6 +108,7 @@
   <script>
     (function() {
       var form = document.getElementById('search-form');
+      var travelDate = document.getElementById('travel_date');
       var returnDate = document.getElementById('return_date');
       var returnRadio = document.getElementById('journey-return');
       var journeyRadios = document.querySelectorAll('input[name="journey_type"]');
@@ -119,21 +120,39 @@
       }
 
       function syncReturnDate() {
-        returnDate.name = currentJourneyType() === 'return' ? returnDateName : '';
+        var isReturn = currentJourneyType() === 'return';
+        returnDate.name = isReturn ? returnDateName : '';
+        returnDate.disabled = !isReturn;
       }
 
-      returnDate.addEventListener('focus', function() {
-        returnRadio.checked = true;
-        syncReturnDate();
-      });
-      returnDate.addEventListener('change', function() {
-        returnRadio.checked = true;
-        syncReturnDate();
+      function updateReturnMin() {
+        if (travelDate.value) {
+          returnDate.min = travelDate.value;
+          if (returnDate.value < travelDate.value) {
+            returnDate.value = travelDate.value;
+          }
+        }
+      }
+
+      // Clicking anywhere in the return date group (including label/disabled input)
+      // activates return journey type and enables the field
+      document.getElementById('return-date-group').addEventListener('click', function() {
+        if (returnDate.disabled) {
+          returnRadio.checked = true;
+          syncReturnDate();
+          returnDate.focus();
+        }
       });
+
+      travelDate.addEventListener('change', updateReturnMin);
+
       journeyRadios.forEach(function(radio) {
         radio.addEventListener('change', syncReturnDate);
       });
+
       form.addEventListener('submit', syncReturnDate);
+
+      updateReturnMin();
       syncReturnDate();
     })();
   </script>