diff --git a/src/Utils/OsmServer.h b/src/Utils/OsmServer.h
index 7b4f4896..1b23ff72 100644
--- a/src/Utils/OsmServer.h
+++ b/src/Utils/OsmServer.h
@@ -62,6 +62,11 @@ class IOsmServerImpl : public QObject {
             return QUrl(getServerInfo().Url);
         }
 
+        virtual QUrl apiUrl() const {
+            return QUrl(getServerInfo().Url).resolved(QUrl("/api/0.6"));
+        }
+
+
         enum class Error {
             NoError,
             Unauthorized,
diff --git a/src/common/GotoDialog.cpp b/src/common/GotoDialog.cpp
index 8fe9f0dd..93318884 100644
--- a/src/common/GotoDialog.cpp
+++ b/src/common/GotoDialog.cpp
@@ -69,7 +69,7 @@ GotoDialog::GotoDialog(MapView* aView, QWidget *parent)
         .arg(QString::number(OsmZoom))
         );
     coordOsmApi->setText( QString("%1/map?bbox=%2,%3,%4,%5")
-//        .arg(M_PREFS->getOsmApiUrl()) //FIXME: Wut?
+        .arg(M_PREFS->getOsmServer()->apiUrl().toString())
         .arg(COORD2STRING(theViewport.bottomLeft().x()))
         .arg(COORD2STRING(theViewport.bottomLeft().y()))
         .arg(COORD2STRING(theViewport.topRight().x()))