diff --git a/static/js/controllers.js b/static/js/controllers.js
index dc7552eb3..b0e1f315e 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -62,7 +62,14 @@ function HeaderCtrl($scope, $location, UserService, Restangular) {
       UserService.load();
       $location.path('/');
     });
-  }
+  };
+
+  $scope.appLinkTarget = function() {
+    if ($("div[ng-view]").length === 0) {
+      return "_self";
+    }
+    return "";
+  };
 
   $scope.$on('$includeContentLoaded', function() {
     // THIS IS BAD, MOVE THIS TO A DIRECTIVE
diff --git a/static/partials/header.html b/static/partials/header.html
index a80b3d5d3..264fcbfec 100644
--- a/static/partials/header.html
+++ b/static/partials/header.html
@@ -14,9 +14,9 @@
 <!-- Collapsable stuff -->
 <div class="collapse navbar-collapse navbar-ex1-collapse">
   <ul class="nav navbar-nav">
-    <li><a ng-href="/repository/">Repositories</a></li>
-    <li><a ng-href="/guide/">User Guide</a></li>
-    <li><a ng-href="/plans/">Plans &amp; Pricing</a></li>
+    <li><a ng-href="/repository/" target="{{ appLinkTarget() }}">Repositories</a></li>
+    <li><a ng-href="/guide/" target="{{ appLinkTarget() }}">User Guide</a></li>
+    <li><a ng-href="/plans/" target="{{ appLinkTarget() }}">Plans &amp; Pricing</a></li>
   </ul>
 
   
@@ -38,7 +38,7 @@
       </a>
       <ul class="dropdown-menu">
         <li>
-          <a href="/user/">
+          <a href="/user/" target="{{ appLinkTarget() }}">
             Account Settings
             <span class="badge user-notification" ng-show="user.askForPassword">1</span>
           </a>