diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index 9b8871eb41..7e439cbd53 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -88,6 +88,11 @@ PLUGIN_HEADER
 #define BATTERY_ON  BUTTON_PLAY
 #define BATTERY_OFF BUTTON_POWER
 
+#elif CONFIG_KEYPAD == GIGABEAT_PAD
+
+#define BATTERY_ON  BUTTON_SELECT
+#define BATTERY_OFF BUTTON_POWER
+
 #endif
 
 
diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c
index 6a1d306339..25b0aff8d9 100644
--- a/apps/plugins/clock.c
+++ b/apps/plugins/clock.c
@@ -228,6 +228,24 @@ PLUGIN_HEADER
 #define MENU_BUTTON_TEXT "PLAY"
 #define COUNTER_BUTTON_TEXT "PLAY"
 
+#elif (CONFIG_KEYPAD == GIGABEAT_PAD)
+
+#define COUNTER_TOGGLE_BUTTON (BUTTON_SELECT|BUTTON_REL)
+#define COUNTER_RESET_BUTTON (BUTTON_SELECT|BUTTON_REPEAT)
+#define MENU_BUTTON BUTTON_MENU
+#define EXIT_BUTTON BUTTON_A
+#define MOVE_UP_BUTTON BUTTON_UP
+#define MOVE_DOWN_BUTTON BUTTON_DOWN
+#define CHANGE_UP_BUTTON BUTTON_RIGHT
+#define CHANGE_DOWN_BUTTON BUTTON_LEFT
+
+#define YESTEXT "Select"
+#define NAVI_BUTTON_TEXT_LEFT "LEFT"
+#define NAVI_BUTTON_TEXT_RIGHT "RIGHT"
+#define EXIT_BUTTON_TEXT "A"
+#define MENU_BUTTON_TEXT "CENTER"
+#define COUNTER_BUTTON_TEXT "CENTER"
+
 #endif
 
 /************
diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c
index 8dffaa0f43..5f7f6b73c8 100644
--- a/apps/plugins/rockboy/menu.c
+++ b/apps/plugins/rockboy/menu.c
@@ -13,11 +13,6 @@
 #define MENU_BUTTON_DOWN BUTTON_SCROLL_FWD
 #define MENU_BUTTON_LEFT BUTTON_LEFT
 #define MENU_BUTTON_RIGHT BUTTON_RIGHT
-#elif (CONFIG_KEYPAD == GIGABEAT_PAD)
-#define MENU_BUTTON_UP BUTTON_UP
-#define MENU_BUTTON_DOWN BUTTON_DOWN
-#define MENU_BUTTON_LEFT BUTTON_LEFT
-#define MENU_BUTTON_RIGHT BUTTON_RIGHT
 #else
 #define MENU_BUTTON_UP BUTTON_UP
 #define MENU_BUTTON_DOWN BUTTON_DOWN
diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c
index cd931c41a7..431fe130a0 100644
--- a/apps/plugins/rockboy/sys_rockbox.c
+++ b/apps/plugins/rockboy/sys_rockbox.c
@@ -180,7 +180,8 @@ void ev_poll(void)
 #endif
 #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
     (CONFIG_KEYPAD == IRIVER_H300_PAD) || \
-    (CONFIG_KEYPAD == IPOD_4G_PAD)
+    (CONFIG_KEYPAD == IPOD_4G_PAD) || \
+    (CONFIG_KEYPAD == GIGABEAT_PAD)
 #ifdef HAVE_WHEEL_POSITION
             rb->wheel_send_events(true);
 #endif