diff --git a/library/Businessprocess/Renderer/TileRenderer/NodeTile.php b/library/Businessprocess/Renderer/TileRenderer/NodeTile.php
index 7870842..fc4ce3b 100644
--- a/library/Businessprocess/Renderer/TileRenderer/NodeTile.php
+++ b/library/Businessprocess/Renderer/TileRenderer/NodeTile.php
@@ -192,6 +192,8 @@ class NodeTile extends BaseElement
             $link = Link::create($node->getAlias(), $url);
             if ($node instanceof ImportedNode) {
                 $link->attributes()->add('data-base-target', '_next');
+            } else {
+                $link->attributes()->add('data-base-target', '_self');
             }
         }
 
@@ -210,7 +212,7 @@ class NodeTile extends BaseElement
                 null,
                 array(
                     'title' => $this->translate('Show tiles for this subtree'),
-                    'data-base-target' => '_next'
+                    'data-base-target' => '_self'
                 )
             ))->add(Link::create(
                 Icon::create('sitemap'),
diff --git a/library/Businessprocess/Web/Component/BpDashboardTile.php b/library/Businessprocess/Web/Component/BpDashboardTile.php
index 1d00681..af81804 100644
--- a/library/Businessprocess/Web/Component/BpDashboardTile.php
+++ b/library/Businessprocess/Web/Component/BpDashboardTile.php
@@ -21,7 +21,7 @@ class BpDashboardTile extends BaseElement
     {
         $this->add(
             Container::create(
-                ['class' => 'bp-link'],
+                ['class' => 'bp-link', 'data-base-target' => '_main'],
                 Link::create(
                     Icon::create($icon),
                     $url,