diff --git a/static/js/app.js b/static/js/app.js
index b20117e6a..207ef56f0 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -728,7 +728,7 @@ quayApp.directive('namespaceSelector', function () {
       'namespace': '=namespace',
       'requireCreate': '=requireCreate'
     },
-    controller: function($scope, $element, $cookieStore) {
+    controller: function($scope, $element, $routeParams, $cookieStore) {
       $scope.namespaces = {};
 
       $scope.initialize = function(user) {
@@ -740,7 +740,7 @@ quayApp.directive('namespaceSelector', function () {
           }
         }
 
-        var initialNamespace = $cookieStore.get('quay.currentnamespace') || $scope.user.username;
+        var initialNamespace = $routeParams['namespace'] || $cookieStore.get('quay.currentnamespace') || $scope.user.username;
         $scope.namespaces = namespaces;
         $scope.setNamespace($scope.namespaces[initialNamespace]);
       };