diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/Quickfinder.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/Quickfinder.java
index b176ab2ef4f..d32617b37a0 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/Quickfinder.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/Quickfinder.java
@@ -17,7 +17,6 @@ import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.EventListener;
 import com.google.gwt.user.client.ui.Widget;
-import com.sap.sailing.gwt.home.mobile.places.RegattaLeaderboardNavigationProvider;
 
 public class Quickfinder extends Widget implements HasSelectionHandlers<String> {
     private static QuickfinderUiBinder uiBinder = GWT.create(QuickfinderUiBinder.class);
@@ -30,16 +29,16 @@ public class Quickfinder extends Widget implements HasSelectionHandlers<String>
     @UiField
     protected SelectElement selectUi;
     
-    public Quickfinder(final RegattaLeaderboardNavigationProvider presenter) {
+    public Quickfinder(final QuickfinderNavigationHandler presenter) {
         setElement(uiBinder.createAndBindUi(this));
         Event.sinkEvents(selectUi, Event.ONCHANGE);
         Event.setEventListener(selectUi, new EventListener() {
             @Override
             public void onBrowserEvent(Event event) {
                 OptionElement oe = event.getEventTarget().cast();
-                presenter.getRegattaMiniLeaderboardNavigation(oe.getValue()).goToPlace();
+                presenter.navigate(oe.getValue());
             }
-        });        
+        });
     }
     
     @Override
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/QuickfinderNavigationHandler.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/QuickfinderNavigationHandler.java
new file mode 100644
index 00000000000..0e76e59c8b3
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/quickfinder/QuickfinderNavigationHandler.java
@@ -0,0 +1,5 @@
+package com.sap.sailing.gwt.home.mobile.partials.quickfinder;
+
+public interface QuickfinderNavigationHandler {
+    void navigate(String value);
+}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivity.java
index 6d045950b91..3fb6434e32f 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivity.java
@@ -143,6 +143,11 @@ public class EventActivity extends AbstractActivity implements Presenter {
     public String getRaceViewerURL(String regattaName, String trackedRaceName) {
         return null;
     }
+    
+    @Override
+    public void navigate(String regattaId) {
+        getRegattaMiniLeaderboardNavigation(regattaId).goToPlace();
+    }
 
     @Override
     public PlaceNavigation<?> getRegattaLeaderboardNavigation(String leaderboardName) {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventView.java
index 4c3d99e0a4b..223a4eb2910 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventView.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventView.java
@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.gwt.home.client.place.event.EventContext;
+import com.sap.sailing.gwt.home.mobile.partials.quickfinder.QuickfinderNavigationHandler;
 import com.sap.sailing.gwt.home.mobile.partials.updatesBox.NewsItemLinkProvider;
 import com.sap.sailing.gwt.home.mobile.places.RegattaLeaderboardNavigationProvider;
 import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
@@ -24,7 +25,7 @@ public interface EventView {
 
     void setMediaForImpressions(int nrOfImages, int nrOfVideos, List<SailingImageDTO> images);
 
-    public interface Presenter extends NewsItemLinkProvider, RegattaLeaderboardNavigationProvider {
+    public interface Presenter extends NewsItemLinkProvider, RegattaLeaderboardNavigationProvider, QuickfinderNavigationHandler {
         EventContext getCtx();
         DispatchSystem getDispatch();
         String getRaceViewerURL(String regattaName, String trackedRaceName);
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardActivity.java
index d850c31dc36..721616785a4 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardActivity.java
@@ -62,6 +62,11 @@ public class MiniLeaderboardActivity extends AbstractActivity implements Present
     public EventContext getCtx() {
         return place.getCtx();
     }
+    
+    @Override
+    public void navigate(String regattaId) {
+        getRegattaMiniLeaderboardNavigation(regattaId).goToPlace();
+    }
 
     @Override
     public PlaceNavigation<?> getRegattaLeaderboardNavigation(String leaderboardName) {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardView.java
index d91c9d592ce..a4685ef5e1a 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardView.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardView.java
@@ -4,13 +4,14 @@ import java.util.Collection;
 
 import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.gwt.home.client.place.event.EventContext;
+import com.sap.sailing.gwt.home.mobile.partials.quickfinder.QuickfinderNavigationHandler;
 import com.sap.sailing.gwt.home.mobile.places.RegattaLeaderboardNavigationProvider;
 import com.sap.sailing.gwt.home.shared.dispatch.DispatchSystem;
 import com.sap.sailing.gwt.ui.shared.eventview.RegattaMetadataDTO;
 
 public interface MiniLeaderboardView {
 
-    public interface Presenter extends RegattaLeaderboardNavigationProvider {
+    public interface Presenter extends RegattaLeaderboardNavigationProvider, QuickfinderNavigationHandler {
 
         DispatchSystem getDispatch();