diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index a8349f4c06..5263ab3bd7 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -120,9 +120,10 @@ F3: equal to "="
 
 #elif CONFIG_KEYPAD == IRIVER_H100_PAD
 #define CALCULATOR_QUIT BUTTON_OFF
-#define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT
-#define CALCULATOR_INPUT (BUTTON_ON | BUTTON_REL)
-#define CALCULATOR_CALC (BUTTON_ON | BUTTON_REPEAT)
+#define CALCULATOR_INPUT BUTTON_SELECT
+#define CALCULATOR_CALC BUTTON_ON
+#define CALCULATOR_OPERATORS BUTTON_MODE
+#define CALCULATOR_CLEAR BUTTON_REC
 
 #endif