2 files changed, 10 insertions, 1 deletions

diff --git a/firmware/target/hosted/android/button-android.c b/firmware/target/hosted/android/button-android.c
index ee8b32d704..b4f3d1bd90 100644
--- a/firmware/target/hosted/android/button-android.c
+++ b/firmware/target/hosted/android/button-android.c
@@ -129,6 +129,11 @@ void button_init_device(void)
     set_rockbox_ready();
 }
 
+void touchscreen_enable_device(bool en)
+{
+    (void)en; /* FIXME: do something smart */
+}
+
 int button_read_device(int *data)
 {
     int btn = last_btns;
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c
index 4bd4b8de64..f69c0a509b 100644
--- a/firmware/target/hosted/sdl/button-sdl.c
+++ b/firmware/target/hosted/sdl/button-sdl.c
@@ -393,10 +393,14 @@ static void button_event(int key, bool pressed)
 #endif
     default:
 #ifdef HAVE_TOUCHSCREEN
-        new_btn = key_to_touch(key, mouse_coords);
+        if(touchscreen_is_enabled())
+            new_btn = key_to_touch(key, mouse_coords);
         if (!new_btn)
 #endif
             new_btn = key_to_button(key);
+#ifdef HAVE_TOUCHPAD
+        new_btn = touchpad_filter(new_btn);
+#endif
         break;
     }
     /* Call to make up for scrollwheel target implementation.  This is