2 files changed, 10 insertions, 1 deletions

diff --git a/apps/screens.c b/apps/screens.c
index 00106df8ba..53d043827a 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -230,6 +230,10 @@ bool f2_screen(void)
                 used = true;
                 break;
 
+            case BUTTON_F2 | BUTTON_REPEAT:
+                used = true;
+                break;
+
             case SYS_USB_CONNECTED:
                 usb_screen();
                 return true;
@@ -290,6 +294,10 @@ bool f3_screen(void)
                 used = true;
                 break;
 
+            case BUTTON_F3 | BUTTON_REPEAT:
+                used = true;
+                break;
+
             case SYS_USB_CONNECTED:
                 usb_screen();
                 return true;
diff --git a/apps/tree.c b/apps/tree.c
index b31d9aaf4c..ca6aeba184 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -125,7 +125,7 @@ extern unsigned char bitmap_icons_6x8[LastIcon][6];
 #define TREE_EXIT  BUTTON_LEFT
 #define TREE_ENTER BUTTON_RIGHT
 #define TREE_MENU  BUTTON_F1
-#define RELEASE_MASK (BUTTON_OFF | BUTTON_F2 | BUTTON_F3)
+#define RELEASE_MASK (BUTTON_OFF | BUTTON_ON | BUTTON_F2 | BUTTON_F3)
 #else
 #define TREE_NEXT  BUTTON_RIGHT
 #define TREE_PREV  BUTTON_LEFT
@@ -613,6 +613,7 @@ bool dirbrowse(char *root)
 
     start_resume();
     button_set_release(RELEASE_MASK);
+    button_set_repeat(~0);
 
     numentries = showdir(currdir, dirstart);
     if (numentries == -1)