diff --git a/src/core/globalshortcuts.cpp b/src/core/globalshortcuts.cpp
index af0c87995..63719ac5f 100644
--- a/src/core/globalshortcuts.cpp
+++ b/src/core/globalshortcuts.cpp
@@ -40,11 +40,11 @@ GlobalShortcuts::GlobalShortcuts(QObject *parent)
   // Create actions
   AddShortcut("play", tr("Play"), SIGNAL(Play()));
   AddShortcut("pause", tr("Pause"), SIGNAL(Pause()));
-  AddShortcut("play_pause", tr("Play/Pause"), SIGNAL(PlayPause())); //QKeySequence(Qt::Key_MediaPlay));
-  AddShortcut("stop", tr("Stop"), SIGNAL(Stop()));// QKeySequence(Qt::Key_MediaStop));
+  AddShortcut("play_pause", tr("Play/Pause"), SIGNAL(PlayPause()), QKeySequence(Qt::Key_MediaPlay));
+  AddShortcut("stop", tr("Stop"), SIGNAL(Stop()), QKeySequence(Qt::Key_MediaStop));
   AddShortcut("stop_after", tr("Stop playing after current track"), SIGNAL(StopAfter()));
-  AddShortcut("next_track", tr("Next track"), SIGNAL(Next()));// QKeySequence(Qt::Key_MediaNext));
-  AddShortcut("prev_track", tr("Previous track"), SIGNAL(Previous()));// QKeySequence(Qt::Key_MediaPrevious));
+  AddShortcut("next_track", tr("Next track"), SIGNAL(Next()), QKeySequence(Qt::Key_MediaNext));
+  AddShortcut("prev_track", tr("Previous track"), SIGNAL(Previous()), QKeySequence(Qt::Key_MediaPrevious));
   AddShortcut("inc_volume", tr("Increase volume"), SIGNAL(IncVolume()));
   AddShortcut("dec_volume", tr("Decrease volume"), SIGNAL(DecVolume()));
   AddShortcut("mute", tr("Mute"), SIGNAL(Mute()));
diff --git a/src/core/macglobalshortcutbackend.h b/src/core/macglobalshortcutbackend.h
index 97a3d8ef0..d4c574e9f 100644
--- a/src/core/macglobalshortcutbackend.h
+++ b/src/core/macglobalshortcutbackend.h
@@ -22,6 +22,8 @@
 #include <QKeySequence>
 #include <QMap>
 
+#include <boost/scoped_ptr.hpp>
+
 class MacGlobalShortcutBackendPrivate;
 class QAction;
 
@@ -51,7 +53,7 @@ private:
   } accessibility_status_;
 
   friend class MacGlobalShortcutBackendPrivate;
-  MacGlobalShortcutBackendPrivate* p_;
+  boost::scoped_ptr<MacGlobalShortcutBackendPrivate> p_;
 };
 
 #endif // MACGLOBALSHORTCUTBACKEND_H
diff --git a/src/core/macglobalshortcutbackend.mm b/src/core/macglobalshortcutbackend.mm
index e34a4510f..9d8485dcb 100644
--- a/src/core/macglobalshortcutbackend.mm
+++ b/src/core/macglobalshortcutbackend.mm
@@ -139,7 +139,6 @@ MacGlobalShortcutBackend::MacGlobalShortcutBackend(GlobalShortcuts* parent)
 }
 
 MacGlobalShortcutBackend::~MacGlobalShortcutBackend() {
-  delete p_;
 }
 
 bool MacGlobalShortcutBackend::DoRegister() {
@@ -170,13 +169,13 @@ void MacGlobalShortcutBackend::DoUnregister() {
 void MacGlobalShortcutBackend::MacMediaKeyPressed(int key) {
   switch (key) {
     case NX_KEYTYPE_PLAY:
-      manager_->shortcuts()["play_pause"].action->trigger();
+      KeyPressed(Qt::Key_MediaPlay);
       break;
     case NX_KEYTYPE_FAST:
-      manager_->shortcuts()["next_track"].action->trigger();
+      KeyPressed(Qt::Key_MediaNext);
       break;
     case NX_KEYTYPE_REWIND:
-      manager_->shortcuts()["prev_track"].action->trigger();
+      KeyPressed(Qt::Key_MediaPrevious);
       break;
   }
 }