diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c
index 579a74a78a..7996af583d 100644
--- a/uisimulator/win32/button.c
+++ b/uisimulator/win32/button.c
@@ -260,11 +260,14 @@ void button_clear_queue(void)
     queue_clear(&button_queue);
 }
 
-#if CONFIG_KEYPAD == IRIVER_H100_PAD
+#ifdef HAS_BUTTON_HOLD
 bool button_hold(void) {
     /* temp fix for hold button on irivers */
     return false;
 }
+#endif
+
+#ifdef HAS_REMOTE_BUTTON_HOLD
 bool remote_button_hold(void) {
     /* temp fix for hold button on irivers */
     return false;
diff --git a/uisimulator/x11/button-x11.c b/uisimulator/x11/button-x11.c
index e037867caf..08b09cf8cb 100644
--- a/uisimulator/x11/button-x11.c
+++ b/uisimulator/x11/button-x11.c
@@ -297,11 +297,14 @@ void button_clear_queue(void)
     queue_clear(&button_queue);
 }
 
-#if CONFIG_KEYPAD == IRIVER_H100_PAD
+#ifdef HAS_BUTTON_HOLD
 bool button_hold(void) {
     /* temp fix for hold button on irivers */
     return false;
 }
+#endif
+
+#ifdef HAS_REMOTE_BUTTON_HOLD
 bool remote_button_hold(void) {
     /* temp fix for hold button on irivers */
     return false;