diff --git a/apps/tree.c b/apps/tree.c
index 25b1796988..4ccd7025d5 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -619,7 +619,7 @@ static bool dirbrowse(void)
     char buf[MAX_PATH];
     int i;
     int lasti=-1;
-    int button;
+    unsigned button;
     int tree_max_on_screen;
     bool reload_root = false;
     int lastfilter = *tc.dirfilter;
@@ -630,7 +630,7 @@ static bool dirbrowse(void)
     long thumbnail_time = -1; /* for delaying a thumbnail */
     bool update_all = false; /* set this to true when the whole file list
                                 has been refreshed on screen */
-    int lastbutton = 0;
+    unsigned lastbutton = 0;
     char* currdir = tc.currdir; /* just a shortcut */
     bool id3db = *tc.dirfilter == SHOW_ID3DB;
 
@@ -689,7 +689,7 @@ static bool dirbrowse(void)
 #ifndef SIMULATOR
         if (boot_changed) {
             bool stop = false;
-            int button;
+            unsigned int button;
 
             lcd_clear_display();
             lcd_puts(0,0,str(LANG_BOOT_CHANGED));
diff --git a/apps/wps.c b/apps/wps.c
index e9b6d4969a..91969df00e 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -426,9 +426,9 @@ static void waitfor_nokey(void)
 }
 
 /* demonstrates showing different formats from playtune */
-int wps_show(void)
+long wps_show(void)
 {
-    int button = 0, lastbutton = 0;
+    long button = 0, lastbutton = 0;
     bool ignore_keyup = true;
     bool restore = false;
     long restoretimer = 0; /* timer to delay screen redraw temporarily */
diff --git a/apps/wps.h b/apps/wps.h
index bc2e30e7c0..f218fdd277 100644
--- a/apps/wps.h
+++ b/apps/wps.h
@@ -24,7 +24,7 @@
 extern bool keys_locked;
 extern bool wps_time_countup;
 
-int wps_show(void);
+long wps_show(void);
 bool refresh_wps(bool refresh_scroll);
 void handle_usb(void);