diff --git a/src/applications/config/controller/PhabricatorConfigIssueListController.php b/src/applications/config/controller/PhabricatorConfigIssueListController.php
index 770f79a9f2..0ca94abe04 100644
--- a/src/applications/config/controller/PhabricatorConfigIssueListController.php
+++ b/src/applications/config/controller/PhabricatorConfigIssueListController.php
@@ -1,119 +1,115 @@
 <?php
 
 final class PhabricatorConfigIssueListController
   extends PhabricatorConfigController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
 
     $nav = $this->buildSideNavView();
     $nav->selectFilter('issue/');
 
     $engine = new PhabricatorSetupEngine();
     $response = $engine->execute();
     if ($response) {
       return $response;
     }
     $issues = $engine->getIssues();
 
     $important = $this->buildIssueList(
       $issues,
       PhabricatorSetupCheck::GROUP_IMPORTANT,
       'fa-warning');
     $php = $this->buildIssueList(
       $issues,
       PhabricatorSetupCheck::GROUP_PHP,
       'fa-code');
     $mysql = $this->buildIssueList(
       $issues,
       PhabricatorSetupCheck::GROUP_MYSQL,
       'fa-database');
     $other = $this->buildIssueList(
       $issues,
       PhabricatorSetupCheck::GROUP_OTHER,
       'fa-question-circle');
 
-    $no_issues = null;
-    if (empty($issues)) {
-      $no_issues = id(new PHUIInfoView())
+    $title = pht('Setup Issues');
+    $header = $this->buildHeaderView($title);
+
+    if (!$issues) {
+      $issue_list = id(new PHUIInfoView())
         ->setTitle(pht('No Issues'))
         ->appendChild(
           pht('Your install has no current setup issues to resolve.'))
         ->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
+    } else {
+      $issue_list = array(
+        $important,
+        $php,
+        $mysql,
+        $other,
+      );
+
+      $issue_list = $this->buildConfigBoxView(pht('Issues'), $issue_list);
     }
 
-    $title = pht('Setup Issues');
-    $header = $this->buildHeaderView($title);
-
-    $issue_list = array(
-      $important,
-      $php,
-      $mysql,
-      $other,
-    );
-
-    $issue_list = $this->buildConfigBoxView(pht('Issues'), $issue_list);
-
     $crumbs = $this->buildApplicationCrumbs()
       ->addTextCrumb($title)
       ->setBorder(true);
 
     $content = id(new PHUITwoColumnView())
       ->setHeader($header)
       ->setNavigation($nav)
       ->setFixed(true)
-      ->setMainColumn(array(
-        $no_issues,
-        $issue_list,
-      ));
+      ->setMainColumn($issue_list);
 
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
       ->appendChild($content);
   }
 
   private function buildIssueList(array $issues, $group, $fonticon) {
     assert_instances_of($issues, 'PhabricatorSetupIssue');
     $list = new PHUIObjectItemListView();
     $list->setBig(true);
     $ignored_items = array();
     $items = 0;
 
     foreach ($issues as $issue) {
       if ($issue->getGroup() == $group) {
         $items++;
         $href = $this->getApplicationURI('/issue/'.$issue->getIssueKey().'/');
         $item = id(new PHUIObjectItemView())
           ->setHeader($issue->getName())
           ->setHref($href)
           ->addAttribute($issue->getSummary());
         if (!$issue->getIsIgnored()) {
           $icon = id(new PHUIIconView())
             ->setIcon($fonticon)
             ->setBackground('bg-sky');
           $item->setImageIcon($icon);
           $list->addItem($item);
         } else {
           $icon = id(new PHUIIconView())
             ->setIcon('fa-eye-slash')
             ->setBackground('bg-grey');
           $item->setDisabled(true);
           $item->setImageIcon($icon);
           $ignored_items[] = $item;
         }
       }
     }
 
     foreach ($ignored_items as $item) {
       $list->addItem($item);
     }
 
     if ($items == 0) {
       return null;
     } else {
       return $list;
     }
   }
 
 }