diff --git a/Limelight/UIAppView.m b/Limelight/UIAppView.m
index 6be1b6c..127d311 100644
--- a/Limelight/UIAppView.m
+++ b/Limelight/UIAppView.m
@@ -40,7 +40,12 @@ static UIImage* noImage;
     [_appButton setBackgroundImage:noImage forState:UIControlStateNormal];
     [_appButton setContentEdgeInsets:UIEdgeInsetsMake(0, 4, 0, 4)];
     [_appButton sizeToFit];
-    [_appButton addTarget:self action:@selector(appClicked) forControlEvents:UIControlEventPrimaryActionTriggered];
+    if (@available(iOS 9.0, tvOS 9.0, *)) {
+        [_appButton addTarget:self action:@selector(appClicked) forControlEvents:UIControlEventPrimaryActionTriggered];
+    }
+    else {
+        [_appButton addTarget:self action:@selector(appClicked) forControlEvents:UIControlEventTouchUpInside];
+    }
     
     [self addSubview:_appButton];
     [self sizeToFit];
diff --git a/Limelight/UIComputerView.m b/Limelight/UIComputerView.m
index 7ab9574..be16e57 100644
--- a/Limelight/UIComputerView.m
+++ b/Limelight/UIComputerView.m
@@ -49,7 +49,12 @@ static const int LABEL_DY = 20;
     
     [_hostButton setBackgroundImage:[UIImage imageNamed:@"Computer"] forState:UIControlStateNormal];
     [_hostButton setContentEdgeInsets:UIEdgeInsetsMake(0, 4, 0, 4)];
-    [_hostButton addTarget:self action:@selector(addClicked) forControlEvents:UIControlEventPrimaryActionTriggered];
+    if (@available(iOS 9.0, tvOS 9.0, *)) {
+        [_hostButton addTarget:self action:@selector(addClicked) forControlEvents:UIControlEventPrimaryActionTriggered];
+    }
+    else {
+        [_hostButton addTarget:self action:@selector(addClicked) forControlEvents:UIControlEventTouchUpInside];
+    }
     [_hostButton sizeToFit];
     
     [_hostLabel setText:@"Add Host"];
@@ -84,7 +89,13 @@ static const int LABEL_DY = 20;
     
     UILongPressGestureRecognizer* longPressRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(hostLongClicked:)];
     [_hostButton addGestureRecognizer:longPressRecognizer];
-    [_hostButton addTarget:self action:@selector(hostClicked) forControlEvents:UIControlEventPrimaryActionTriggered];
+    
+    if (@available(iOS 9.0, tvOS 9.0, *)) {
+        [_hostButton addTarget:self action:@selector(hostClicked) forControlEvents:UIControlEventPrimaryActionTriggered];
+    }
+    else {
+        [_hostButton addTarget:self action:@selector(hostClicked) forControlEvents:UIControlEventTouchUpInside];
+    }
     
     [self updateContentsForHost:host];
     [self updateBounds];