diff --git a/Limelight/Input/StreamView.m b/Limelight/Input/StreamView.m
index 009f6b89..817f5a04 100644
--- a/Limelight/Input/StreamView.m
+++ b/Limelight/Input/StreamView.m
@@ -93,7 +93,9 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
                                              selector:@selector(keyboardWillHide:)
                                                  name:UIKeyboardWillHideNotification
                                                object:nil];
-    [self.superview addGestureRecognizer:keyboardToggleRecognizer];
+    if(settings.touchMode.intValue == PURE_NATIVE_TOUCH)    [self addGestureRecognizer:keyboardToggleRecognizer]; //keep legacy approach in pure native mode
+    else [self.superview addGestureRecognizer:keyboardToggleRecognizer]; //add to the superview in other modes
+    
     
 #if TARGET_OS_TV
     // tvOS requires RelativeTouchHandler to manage Apple Remote input