diff --git a/src/applications/conpherence/controller/ConpherenceController.php b/src/applications/conpherence/controller/ConpherenceController.php
index 3645cfe87e..e6690a55d1 100644
--- a/src/applications/conpherence/controller/ConpherenceController.php
+++ b/src/applications/conpherence/controller/ConpherenceController.php
@@ -1,219 +1,225 @@
 <?php
 
 abstract class ConpherenceController extends PhabricatorController {
 
   private $conpherence;
 
   public function setConpherence(ConpherenceThread $conpherence) {
     $this->conpherence = $conpherence;
     return $this;
   }
   public function getConpherence() {
     return $this->conpherence;
   }
 
   public function buildApplicationMenu() {
     $nav = new PHUIListView();
     $conpherence = $this->conpherence;
 
     // Local Links
     if ($conpherence) {
+      $nav->addMenuItem(
+        id(new PHUIListItemView())
+        ->setName(pht('Joined Rooms'))
+        ->setType(PHUIListItemView::TYPE_LINK)
+        ->setHref($this->getApplicationURI()));
+
       $nav->addMenuItem(
         id(new PHUIListItemView())
         ->setName(pht('Edit Room'))
         ->setType(PHUIListItemView::TYPE_LINK)
         ->setHref(
           $this->getApplicationURI('update/'.$conpherence->getID()).'/')
         ->setWorkflow(true));
 
       $nav->addMenuItem(
         id(new PHUIListItemView())
         ->setName(pht('Add Participants'))
         ->setType(PHUIListItemView::TYPE_LINK)
         ->setHref('#')
         ->addSigil('conpherence-widget-adder')
         ->setMetadata(array('widget' => 'widgets-people')));
     }
 
     // Global Links
     $nav->newLabel(pht('Conpherence'));
     $nav->newLink(
       pht('New Room'),
       $this->getApplicationURI('new/'));
     $nav->newLink(
       pht('Search Rooms'),
       $this->getApplicationURI('search/'));
 
     return $nav;
   }
 
   protected function buildHeaderPaneContent(
     ConpherenceThread $conpherence,
     array $policy_objects) {
     assert_instances_of($policy_objects, 'PhabricatorPolicy');
     $viewer = $this->getViewer();
     $header = null;
 
     if ($conpherence->getID()) {
       $data = $conpherence->getDisplayData($this->getViewer());
       $header = id(new PHUIHeaderView())
         ->setHeader($data['title'])
         ->setSubheader($data['topic'])
         ->setImage($data['image']);
 
       $can_edit = PhabricatorPolicyFilter::hasCapability(
         $viewer,
         $conpherence,
         PhabricatorPolicyCapability::CAN_EDIT);
 
       if ($can_edit) {
         $header->setImageURL(
           $this->getApplicationURI('picture/'.$conpherence->getID().'/'));
       }
 
       $participating = $conpherence->getParticipantIfExists($viewer->getPHID());
       $can_join = PhabricatorPolicyFilter::hasCapability(
         $viewer,
         $conpherence,
         PhabricatorPolicyCapability::CAN_JOIN);
 
       $header->addActionItem(
         id(new PHUIIconCircleView())
           ->setHref(
             $this->getApplicationURI('update/'.$conpherence->getID()).'/')
           ->setIcon('fa-pencil')
           ->addClass('hide-on-device')
           ->setColor('violet')
           ->setWorkflow(true));
 
       $header->addActionItem(
         id(new PHUIIconCircleView())
           ->setHref(
             $this->getApplicationURI('update/'.$conpherence->getID()).'/'.
             '?action='.ConpherenceUpdateActions::NOTIFICATIONS)
           ->setIcon('fa-gear')
           ->addClass('hide-on-device')
           ->setColor('pink')
           ->setWorkflow(true));
 
       $widget_key = PhabricatorConpherenceWidgetVisibleSetting::SETTINGKEY;
       $widget_view = (bool)$viewer->getUserSetting($widget_key, false);
 
       Javelin::initBehavior(
         'toggle-widget',
         array(
           'show' => (int)$widget_view,
           'settingsURI' => '/settings/adjust/?key='.$widget_key,
         ));
 
       $header->addActionItem(
         id(new PHUIIconCircleView())
           ->addSigil('conpherence-widget-toggle')
           ->setIcon('fa-group')
           ->setHref('#')
           ->addClass('conpherence-participant-toggle'));
 
       Javelin::initBehavior('conpherence-search');
 
       $header->addActionItem(
         id(new PHUIIconCircleView())
           ->addSigil('conpherence-search-toggle')
           ->setIcon('fa-search')
           ->setHref('#')
           ->setColor('green')
           ->addClass('conpherence-search-toggle'));
 
       if ($can_join && !$participating) {
         $action = ConpherenceUpdateActions::JOIN_ROOM;
         $uri = $this->getApplicationURI('update/'.$conpherence->getID().'/');
         $button = phutil_tag(
           'button',
           array(
             'type' => 'SUBMIT',
             'class' => 'button green mlr',
           ),
           pht('Join Room'));
 
         $hidden = phutil_tag(
           'input',
           array(
             'type' => 'hidden',
             'name' => 'action',
             'value' => ConpherenceUpdateActions::JOIN_ROOM,
           ));
 
         $form = phabricator_form(
           $viewer,
           array(
             'method' => 'POST',
             'action' => (string)$uri,
           ),
           array(
             $hidden,
             $button,
           ));
         $header->addActionItem($form);
       }
     }
 
     return $header;
   }
 
   public function buildSearchForm() {
     $viewer = $this->getViewer();
     $conpherence = $this->conpherence;
     $name = $conpherence->getTitle();
 
     $bar = javelin_tag(
       'input',
       array(
         'type' => 'text',
         'id' => 'conpherence-search-input',
         'name' => 'fulltext',
         'class' => 'conpherence-search-input',
         'sigil' => 'conpherence-search-input',
         'placeholder' => pht('Search %s...', $name),
       ));
 
     $id = $conpherence->getID();
     $form = phabricator_form(
       $viewer,
       array(
         'method' => 'POST',
         'action' => '/conpherence/threadsearch/'.$id.'/',
         'sigil' => 'conpherence-search-form',
         'class' => 'conpherence-search-form',
         'id' => 'conpherence-search-form',
       ),
       array(
         $bar,
       ));
 
     $form_view = phutil_tag(
       'div',
       array(
         'class' => 'conpherence-search-form-view',
       ),
       $form);
 
     $results = phutil_tag(
       'div',
       array(
         'id' => 'conpherence-search-results',
         'class' => 'conpherence-search-results',
       ));
 
     $view = phutil_tag(
       'div',
       array(
         'class' => 'conpherence-search-window',
       ),
       array(
         $form_view,
         $results,
       ));
 
     return $view;
   }
 
 }