diff --git a/apps/plugin.h b/apps/plugin.h
index bfd86cc8c3..bd9cd5a332 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -159,8 +159,8 @@ struct plugin_api {
     void (*splash)(int ticks, bool center, const char *fmt, ...);
 
     /* button */
-    int (*button_get)(bool block);
-    int (*button_get_w_tmo)(int ticks);
+    long (*button_get)(bool block);
+    long (*button_get_w_tmo)(int ticks);
     int (*button_status)(void);
     void (*button_clear_queue)(void);
 
diff --git a/uisimulator/x11/button-x11.c b/uisimulator/x11/button-x11.c
index ba70c8129b..21393215a4 100644
--- a/uisimulator/x11/button-x11.c
+++ b/uisimulator/x11/button-x11.c
@@ -187,7 +187,7 @@ static int get_raw_button (void)
 /*
  * Timeout after TICKS unless a key is pressed.
  */
-int button_get_w_tmo(int ticks)
+long button_get_w_tmo(int ticks)
 {
     int bits;
     int i=0;
@@ -210,7 +210,7 @@ int button_get_w_tmo(int ticks)
  * BUTTON_HELD bit is while the button is being held.
  * BUTTON_REL bit is set when button has been released.
  */
-int button_get(bool block)
+long button_get(bool block)
 {
     int bits;
     do {