diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => 'e50c063a',
+    'core.pkg.css' => '3b2e293c',
     'core.pkg.js' => '7d8faf57',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => '2de124c9',
@@ -135,7 +135,7 @@
     'rsrc/css/phui/phui-form-view.css' => '4a1a0f5e',
     'rsrc/css/phui/phui-form.css' => 'aac1d51d',
     'rsrc/css/phui/phui-head-thing.css' => '11731da0',
-    'rsrc/css/phui/phui-header-view.css' => 'b541cc78',
+    'rsrc/css/phui/phui-header-view.css' => '6152c91b',
     'rsrc/css/phui/phui-hovercard.css' => 'de1a2119',
     'rsrc/css/phui/phui-icon-set-selector.css' => '1ab67aad',
     'rsrc/css/phui/phui-icon.css' => '3f33ab57',
@@ -820,7 +820,7 @@
     'phui-form-css' => 'aac1d51d',
     'phui-form-view-css' => '4a1a0f5e',
     'phui-head-thing-view-css' => '11731da0',
-    'phui-header-view-css' => 'b541cc78',
+    'phui-header-view-css' => '6152c91b',
     'phui-hovercard' => '1bd28176',
     'phui-hovercard-view-css' => 'de1a2119',
     'phui-icon-set-selector-css' => '1ab67aad',
diff --git a/src/view/phui/PHUIHeaderView.php b/src/view/phui/PHUIHeaderView.php
--- a/src/view/phui/PHUIHeaderView.php
+++ b/src/view/phui/PHUIHeaderView.php
@@ -253,8 +253,9 @@
     $left = array();
     $right = array();
 
+    $space_header = null;
     if ($viewer) {
-      $left[] = id(new PHUISpacesNamespaceContextView())
+      $space_header = id(new PHUISpacesNamespaceContextView())
         ->setUser($viewer)
         ->setObject($this->policyObject);
     }
@@ -335,7 +336,10 @@
       array(
         'class' => 'phui-header-header',
       ),
-      $header_content);
+      array(
+        $space_header,
+        $header_content,
+      ));
 
     if ($this->subheader || $this->badges) {
       $badges = null;
diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css
--- a/webroot/rsrc/css/phui/phui-header-view.css
+++ b/webroot/rsrc/css/phui/phui-header-view.css
@@ -272,10 +272,16 @@
   font-size: 18px;
 }
 
-.spaces-name .phui-handle {
+.spaces-name .phui-handle,
+.spaces-name a.phui-handle {
   color: {$sh-redtext};
 }
 
+.device-desktop .spaces-name a.phui-handle:hover {
+  color: {$sh-redtext};
+  text-decoration: underline;
+}
+
 .phui-header-subheader .phui-badge-flex-view {
   display: inline;
   margin-right: 4px;