--- a/widget/gonk/nsAppShell.cpp
+++ b/widget/gonk/nsAppShell.cpp
@@ -236,51 +236,39 @@ sendKeyEvent(PRUint32 keyCode, bool down
     if (down) {
         sendKeyEventWithMsg(keyCode, NS_KEY_PRESS, timeMs,
                             status == nsEventStatus_eConsumeNoDefault ?
                             NS_EVENT_FLAG_NO_DEFAULT : 0);
     }
 }
 
 static void
-sendSpecialKeyEvent(nsIAtom *command, uint64_t timeMs)
-{
-    nsCommandEvent event(true, nsGkAtoms::onAppCommand, command, NULL);
-    event.time = timeMs;
-    nsWindow::DispatchInputEvent(event);
-}
-
-static void
 maybeSendKeyEvent(int keyCode, bool pressed, uint64_t timeMs)
 {
     switch (keyCode) {
     case KEY_BACK:
         sendKeyEvent(NS_VK_ESCAPE, pressed, timeMs);
         break;
     case KEY_MENU:
-        if (!pressed)
-            sendSpecialKeyEvent(nsGkAtoms::Menu, timeMs);
+         sendKeyEvent(NS_VK_CONTEXT_MENU, pressed, timeMs);
         break;
     case KEY_SEARCH:
-        if (pressed)
-            sendSpecialKeyEvent(nsGkAtoms::Search, timeMs);
+        sendKeyEvent(NS_VK_F5, pressed, timeMs);
         break;
     case KEY_HOME:
         sendKeyEvent(NS_VK_HOME, pressed, timeMs);
         break;
     case KEY_POWER:
         sendKeyEvent(NS_VK_SLEEP, pressed, timeMs);
         break;
     case KEY_VOLUMEUP:
-        if (pressed)
-            sendSpecialKeyEvent(nsGkAtoms::VolumeUp, timeMs);
+        sendKeyEvent(NS_VK_PAGE_UP, pressed, timeMs);
         break;
     case KEY_VOLUMEDOWN:
-        if (pressed)
-            sendSpecialKeyEvent(nsGkAtoms::VolumeDown, timeMs);
+        sendKeyEvent(NS_VK_PAGE_DOWN, pressed, timeMs);
         break;
     default:
         VERBOSE_LOG("Got unknown key event code. type 0x%04x code 0x%04x value %d",
                     keyCode, pressed);
     }
 }
 
 class GeckoInputReaderPolicy : public InputReaderPolicyInterface {