diff --git a/src/main/java/com/example/application/navigation/Navigation.java b/src/main/java/com/example/application/navigation/Navigation.java
index 775fad1..b3eafe5 100644
--- a/src/main/java/com/example/application/navigation/Navigation.java
+++ b/src/main/java/com/example/application/navigation/Navigation.java
@@ -117,9 +117,9 @@ public class Navigation implements HasUrlParameter<String> {
                 this.seasonParam = seasonParam;
                 this.matchdayParam = matchdayParam;
                 this.matchParam = null;
-                updateUrl();
-                runnablesToBeRunAfterSeasonSelection.forEach(Runnable::run);
             }
+            runnablesToBeRunAfterSeasonSelection.forEach(Runnable::run);
+            updateUrl();
         };
     }
 
@@ -131,10 +131,10 @@ public class Navigation implements HasUrlParameter<String> {
             } else {
                 matchdayParam = matchday.toString();
                 fillMatchSelectWithData(matchday);
-                configureButtons();
-                matchSelect.setValue(null);
-                runnablesToBeRunAfterMatchdaySelection.forEach(Runnable::run);
             }
+            configureButtons();
+            matchSelect.setValue(null);
+            runnablesToBeRunAfterMatchdaySelection.forEach(Runnable::run);
             updateUrl();
         };
     }
@@ -146,9 +146,9 @@ public class Navigation implements HasUrlParameter<String> {
                 matchParam = null;
             } else {
                 matchParam = match.toString();
-                updateUrl();
-                runnablesToBeRunAfterMatchSelection.forEach(Runnable::run);
             }
+            runnablesToBeRunAfterMatchSelection.forEach(Runnable::run);
+            updateUrl();
         };
     }