@@ -61,7 +61,9 @@ NavView {
     }

     Connections {
-        target: KissCore.controllerNavigation
+        id: navigationStartedHanlder
+        property bool enabled: false
+        target: enabled ? KissCore.controllerNavigation : null
         onNavigationStarted: {
             var dialog = DialogManager.showDialogCtrl( gotoAccepted )
             gotoAcceptedDismissTimer.restart()
@@ -118,7 +120,9 @@ NavView {
         type: cACTION
         onClick: {
             if ( echogram.overlaysAvailable ) {
+                navigationStartedHanlder.enabled = true
                 KissCore.controllerNavigation.gotoUserpoint( echogram.markIDUnderCursor )
+                navigationStartedHanlder.false = true
             } else {
                 DialogManager.showDialogCtrl( gotoWarning )
             }
@@ -205,7 +209,9 @@ NavView {
         title: App.tr( qsTr( "Restart Nav" ) )
         type: cACTION
         onClick: {
+            navigationStartedHanlder.enabled = true
             KissCore.controllerNavigation.restartGoto()
+            navigationStartedHanlder.enabled = false
         }
     }

@@ -232,7 +238,9 @@ NavView {
         type: cACTION
         onClick: {
             if ( echogram.overlaysAvailable ) {
+                navigationStartedHanlder.enabled = true
                 KissCore.controllerNavigation.gotoCoordinates( echogram.cursorGeoPosition )
+                navigationStartedHanlder.enabled = false
             } else {
                 DialogManager.showDialogCtrl( gotoWarning )
             }