diff --git a/Limelight/ViewControllers/MainFrameViewController.m b/Limelight/ViewControllers/MainFrameViewController.m
index a2c0992..aa81d9b 100644
--- a/Limelight/ViewControllers/MainFrameViewController.m
+++ b/Limelight/ViewControllers/MainFrameViewController.m
@@ -833,7 +833,7 @@ static NSMutableSet* hostList;
             delegate.shortcutCompletionHandler = nil;
         }
         
-        if (matchingHost != nil && _selectedHost != matchingHost) {
+        if (matchingHost != nil && _selectedHost != matchingHost && matchingHost.state != StateOffline) {
             // Navigate to the host page
             [self hostClicked:matchingHost view:nil];
         }