diff --git a/Limelight/ViewControllers/MainFrameViewController.m b/Limelight/ViewControllers/MainFrameViewController.m
index 16f9215..604cc37 100644
--- a/Limelight/ViewControllers/MainFrameViewController.m
+++ b/Limelight/ViewControllers/MainFrameViewController.m
@@ -138,9 +138,6 @@ static NSMutableSet* hostList;
                 return;
             }
             
-            self.title = host.name;
-            
-            [self enableUpButton];
             [self updateAppsForHost:host];
             [self hideLoadingFrame: nil];
         });
@@ -182,9 +179,6 @@ static NSMutableSet* hostList;
                     return;
                 }
                 
-                self.title = host.name;
-                [self enableUpButton];
-                
                 [self updateAppsForHost:host];
                 [self->_appManager stopRetrieving];
                 [self->_appManager retrieveAssetsFromHost:host];
@@ -299,6 +293,8 @@ static NSMutableSet* hostList;
     
     Log(LOG_D, @"Clicked host: %@", host.name);
     _selectedHost = host;
+    self.title = host.name;
+    [self enableUpButton];
     [self disableNavigation];
     
 #if TARGET_OS_TV