diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index 66ebb43774..4fbf96939d 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -175,16 +175,13 @@
 #define OSCILLOSCOPE_QUIT            BUTTON_POWER
 #define OSCILLOSCOPE_DRAWMODE        (BUTTON_SELECT | BUTTON_REL)
 #define OSCILLOSCOPE_ADVMODE         BUTTON_DOWN
-#define OSCILLOSCOPE_ORIENTATION_PRE BUTTON_UP
-#define OSCILLOSCOPE_ORIENTATION     (BUTTON_UP | BUTTON_REL)
-#define OSCILLOSCOPE_GRAPHMODE_PRE   BUTTON_UP
-#define OSCILLOSCOPE_GRAPHMODE       (BUTTON_UP | BUTTON_REPEAT)
+#define OSCILLOSCOPE_ORIENTATION     BUTTON_UP
 #define OSCILLOSCOPE_PAUSE           (BUTTON_SELECT | BUTTON_UP)
 #define OSCILLOSCOPE_SPEED_UP        BUTTON_RIGHT
 #define OSCILLOSCOPE_SPEED_DOWN      BUTTON_LEFT
 #define OSCILLOSCOPE_VOL_UP          BUTTON_VOL_UP
 #define OSCILLOSCOPE_VOL_DOWN        BUTTON_VOL_DOWN
-#define NEED_LASTBUTTON
+/* Not enough plugin RAM for waveform view */
 
 #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
 #define OSCILLOSCOPE_QUIT            BUTTON_POWER
@@ -383,16 +380,13 @@
 #define OSCILLOSCOPE_QUIT            (BUTTON_MENU | BUTTON_REPEAT)
 #define OSCILLOSCOPE_DRAWMODE        BUTTON_ENTER
 #define OSCILLOSCOPE_ADVMODE         BUTTON_REC
-#define OSCILLOSCOPE_ORIENTATION_PRE BUTTON_MENU
-#define OSCILLOSCOPE_ORIENTATION     (BUTTON_MENU | BUTTON_REL)
-#define OSCILLOSCOPE_GRAPHMODE_PRE   BUTTON_MENU
-#define OSCILLOSCOPE_GRAPHMODE       (BUTTON_MENU | BUTTON_REPEAT)
+#define OSCILLOSCOPE_ORIENTATION     BUTTON_MENU
 #define OSCILLOSCOPE_PAUSE           BUTTON_PLAY
 #define OSCILLOSCOPE_SPEED_UP        BUTTON_FF
 #define OSCILLOSCOPE_SPEED_DOWN      BUTTON_REW
 #define OSCILLOSCOPE_VOL_UP          BUTTON_UP
 #define OSCILLOSCOPE_VOL_DOWN        BUTTON_DOWN
-#define NEED_LASTBUTTON
+/* Need GRAPHMODE */
 
 #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
 #define OSCILLOSCOPE_QUIT         BUTTON_POWER