diff --git a/app/src/main/java/com/gaurav/avnc/ui/vnc/Dispatcher.kt b/app/src/main/java/com/gaurav/avnc/ui/vnc/Dispatcher.kt
index 746708f..49001c6 100644
--- a/app/src/main/java/com/gaurav/avnc/ui/vnc/Dispatcher.kt
+++ b/app/src/main/java/com/gaurav/avnc/ui/vnc/Dispatcher.kt
@@ -190,7 +190,7 @@ class Dispatcher(private val activity: VncActivity) {
         fun doClick(button: PointerButton, p: PointF) {
             doButtonDown(button, p)
             // Some (obscure) apps seems to ignore click event if button-up is received too early
-            if (profile.cfButtonUpDelay)
+            if (button == PointerButton.Left && profile.cfButtonUpDelay)
                 messenger.insertButtonUpDelay()
             doButtonUp(button, p)
         }
diff --git a/app/src/main/java/com/gaurav/avnc/vnc/Messenger.kt b/app/src/main/java/com/gaurav/avnc/vnc/Messenger.kt
index 8ee30ee..c9bc910 100644
--- a/app/src/main/java/com/gaurav/avnc/vnc/Messenger.kt
+++ b/app/src/main/java/com/gaurav/avnc/vnc/Messenger.kt
@@ -81,7 +81,7 @@ class Messenger(private val client: VncClient) {
     }
 
     fun insertButtonUpDelay() {
-        execute { Thread.sleep(200) }
+        execute { runCatching { Thread.sleep(200) } }
     }
 
     /**************************************************************************