diff --git a/static/directives/new-header-bar.html b/static/directives/new-header-bar.html
index f59baca39..37bc74e4b 100644
--- a/static/directives/new-header-bar.html
+++ b/static/directives/new-header-bar.html
@@ -5,7 +5,7 @@
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
         &equiv;
       </button>
-      <a class="navbar-brand" ng-href="{{ user.anonymous ? '/' : '/repository/' }}" target="{{ appLinkTarget }}">
+      <a class="navbar-brand" ng-href="{{ user.anonymous ? '/' : '/repository/' }}" target="{{ appLinkTarget() }}">
         <span id="quay-logo" ng-style="{'background-image': 'url(' + getEnterpriseLogo() + ')'}"></span>
       </a>
       <span class="user-tools visible-xs" style="float: right;">
@@ -19,29 +19,29 @@
     <div class="collapse navbar-collapse navbar-ex1-collapse">
       <!-- Not signed in -->
       <ul class="nav navbar-nav navbar-links" ng-if="user.anonymous">
-        <li><a ng-href="/tour/" target="{{ appLinkTarget }}" quay-section="tour">Tour</a></li>
-        <li><a ng-href="/tutorial/" target="{{ appLinkTarget }}" quay-section="tutorial">Tutorial</a></li>
-        <li quay-require="['BILLING']"><a ng-href="/plans/" target="{{ appLinkTarget }}" quay-section="plans">Pricing</a></li>
+        <li><a ng-href="/tour/" target="{{ appLinkTarget() }}" quay-section="tour">Tour</a></li>
+        <li><a ng-href="/tutorial/" target="{{ appLinkTarget() }}" quay-section="tutorial">Tutorial</a></li>
+        <li quay-require="['BILLING']"><a ng-href="/plans/" target="{{ appLinkTarget() }}" quay-section="plans">Pricing</a></li>
         <li><a href="http://docs.quay.io/" target="_blank">Docs</a></li>
       </ul>
 
       <!-- Signed in -->
       <ul class="nav navbar-nav navbar-links" ng-if="!user.anonymous">
-        <li><a ng-href="/repository/" target="{{ appLinkTarget }}" quay-section="repository">Repositories</a></li>
-        <li><a ng-href="/tutorial/" target="{{ appLinkTarget }}" quay-section="tutorial">Tutorial</a></li>
+        <li><a ng-href="/repository/" target="{{ appLinkTarget() }}" quay-section="repository">Repositories</a></li>
+        <li><a ng-href="/tutorial/" target="{{ appLinkTarget() }}" quay-section="tutorial">Tutorial</a></li>
         <li><a href="http://docs.quay.io/" target="_blank">Docs</a></li>
       </ul>
 
       <!-- Phone -->
       <ul class="nav navbar-nav navbar-right visible-xs" ng-switch on="user.anonymous">
         <li ng-switch-when="false">
-          <a href="/user/{{ user.username }}?tab=settings" class="user-view" target="{{ appLinkTarget }}">
+          <a href="/user/{{ user.username }}?tab=settings" class="user-view" target="{{ appLinkTarget() }}">
             <span class="avatar" size="32" data="user.avatar"></span>
             {{ user.username }}
           </a>
         </li>
         <li ng-switch-default>
-          <a class="user-view" href="/signin/" target="{{ appLinkTarget }}">Sign in</a>
+          <a class="user-view" href="/signin/" target="{{ appLinkTarget() }}">Sign in</a>
         </li>
       </ul>
 
@@ -123,7 +123,7 @@
           </a>
           <ul class="dropdown-menu">
             <li>
-              <a href="/user/{{ user.username }}?tab=settings" target="{{ appLinkTarget }}">
+              <a href="/user/{{ user.username }}?tab=settings" target="{{ appLinkTarget() }}">
                 Account Settings
               </a>
             </li>
@@ -132,7 +132,7 @@
           </ul>
         </li>
         <li ng-switch-default>
-          <a class="user-view" href="/signin/" target="{{ appLinkTarget }}">Sign in</a>
+          <a class="user-view" href="/signin/" target="{{ appLinkTarget() }}">Sign in</a>
         </li>
       </ul>
     </div><!-- /.navbar-collapse -->
diff --git a/static/js/directives/ui/header-bar.js b/static/js/directives/ui/header-bar.js
index e5da1073b..98692ffed 100644
--- a/static/js/directives/ui/header-bar.js
+++ b/static/js/directives/ui/header-bar.js
@@ -110,10 +110,15 @@ angular.module('quay').directive('headerBar', function () {
       };
 
       $scope.appLinkTarget = function() {
-        if ($("div[ng-view]").length === 0) {
-            return "_self";
+        if ($scope._appLinkTarget) {
+          return $scope._appLinkTarget;
         }
-        return "";
+
+        if ($("div[ng-view]").length === 0) {
+            return $scope._appLinkTarget = "_self";
+        }
+
+        return $scope._appLinkTarget = "";
       };
 
       $scope.getEnterpriseLogo = function() {