3 files changed, 28 insertions, 4 deletions

diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c
index 669f8ca09a..4098d630d0 100644
--- a/apps/gui/yesno.c
+++ b/apps/gui/yesno.c
@@ -164,6 +164,12 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message,
         gui_yesno_draw(&(yn[i]));
     }
 
+#ifdef HAVE_TOUCHSCREEN
+    /* switch to point mode because that's more intuitive */
+    enum touchscreen_mode tsm = touchscreen_get_mode();
+    touchscreen_set_mode(TOUCHSCREEN_POINT);
+#endif
+
     /* make sure to eat any extranous keypresses */
     action_wait_for_release();
     button_clear_queue();
@@ -211,12 +217,23 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message,
                 /* ignore some SYS events that can happen */
                 continue;
             default:
-                if(default_event_handler(button) == SYS_USB_CONNECTED)
-                    return(YESNO_USB);
+                if(default_event_handler(button) == SYS_USB_CONNECTED) {
+#ifdef HAVE_TOUCHSCREEN
+                    /* restore old touchscreen mode */
+                    touchscreen_set_mode(tsm);
+#endif
+                    return YESNO_USB;
+                }
+
                 result = YESNO_NO;
         }
     }
 
+#ifdef HAVE_TOUCHSCREEN
+    /* restore old touchscreen mode */
+    touchscreen_set_mode(tsm);
+#endif
+
     FOR_NB_SCREENS(i)
         result_displayed=gui_yesno_draw_result(&(yn[i]), result);
 
diff --git a/apps/keymaps/keymap-shanlingq1.c b/apps/keymaps/keymap-shanlingq1.c
index 4745139e7a..2c09a40f4b 100644
--- a/apps/keymaps/keymap-shanlingq1.c
+++ b/apps/keymaps/keymap-shanlingq1.c
@@ -57,6 +57,13 @@ static const struct button_mapping button_context_list[] = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_list */
 
+static const struct button_mapping button_context_yesno[] = {
+    /* note: touchscreen buttons are usable in addition to physical keys */
+    {ACTION_YESNO_ACCEPT,       BUTTON_PLAY,                        BUTTON_NONE},
+    {ACTION_STD_CANCEL,         BUTTON_POWER,                       BUTTON_NONE},
+    LAST_ITEM_IN_LIST
+}; /* button_context_yesno */
+
 const struct button_mapping* target_get_context_mapping(int context)
 {
     switch (context)
@@ -73,5 +80,7 @@ const struct button_mapping* target_get_context_mapping(int context)
             //return button_context_tree;
         case CONTEXT_LIST:
             return button_context_list;
+        case CONTEXT_YESNOSCREEN:
+            return button_context_yesno;
     }
 }
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c
index 6163cb054c..c70aea2651 100644
--- a/apps/keymaps/keymap-touchscreen.c
+++ b/apps/keymaps/keymap-touchscreen.c
@@ -179,8 +179,6 @@ static const struct button_mapping button_context_mainmenu[] =
 
 
 static const struct button_mapping button_context_yesno[]  = {
-    { ACTION_YESNO_ACCEPT,  BUTTON_TOPRIGHT,  BUTTON_NONE },
-    { ACTION_YESNO_ACCEPT,  BUTTON_BOTTOMLEFT,  BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_YESNOSCREEN)
 }; /* button_context_settings_yesno */