diff --git a/lib/router.js b/lib/router.js
index cab7571..5956b27 100644
--- a/lib/router.js
+++ b/lib/router.js
@@ -119,21 +119,20 @@ define(function () {
       if (d in views) {
         views[d]()
 
-        if (!currentView)
+        if (!currentView || running)
           currentView = d
 
         if (running) {
-          if (currentObject)
+          if (currentObject) {
             if ("node" in currentObject)
               gotoNode(currentObject.node)
             else if ("link" in currentObject)
               gotoLink(currentObject.link)
-          else
-            targets.forEach( function (t) {
-              t.resetView()
-            })
 
-          saveState()
+            saveState()
+          } else
+            console.log("reset view")
+            resetView()
         }
       }
     }