1 files changed, 21 insertions, 5 deletions

diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index d4d890df0d..18ad1c48cb 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -146,15 +146,31 @@ PLUGIN_HEADER
 #define STOPWATCH_RC_QUIT BUTTON_REC
 #elif CONFIG_KEYPAD == COWOND2_PAD
 #define STOPWATCH_QUIT BUTTON_POWER
-#define STOPWATCH_START_STOP BUTTON_SELECT
-#define STOPWATCH_RESET_TIMER BUTTON_MENU
-#define STOPWATCH_LAP_TIMER BUTTON_PLUS
-#define STOPWATCH_SCROLL_UP BUTTON_UP
-#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN
 #else
 #error No keymap defined!
 #endif
 
+#ifdef HAVE_TOUCHPAD
+#ifndef STOPWATCH_QUIT
+#define STOPWATCH_QUIT        BUTTON_TOPLEFT
+#endif
+#ifndef STOPWATCH_START_STOP
+#define STOPWATCH_START_STOP  BUTTON_CENTER
+#endif
+#ifndef STOPWATCH_RESET_TIMER
+#define STOPWATCH_RESET_TIMER BUTTON_MIDRIGHT
+#endif
+#ifndef STOPWATCH_LAP_TIMER
+#define STOPWATCH_LAP_TIMER   BUTTON_MIDLEFT
+#endif
+#ifndef STOPWATCH_SCROLL_UP
+#define STOPWATCH_SCROLL_UP   BUTTON_TOPMIDDLE
+#endif
+#ifndef STOPWATCH_SCROLL_DOWN
+#define STOPWATCH_SCROLL_DOWN BUTTON_BOTTOMMIDDLE
+#endif
+#endif
+
 static struct plugin_api* rb;
 
 static int stopwatch = 0;