diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 2f898d59fbc85cd955c34c50f4a42c61f60be848..a38be7a8289f437bf1a1d57263b428488c5f4522 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -101,8 +101,8 @@
 #define TOUCHPAD_ENABLED_KEY "send-events"
 #define HIGH_CONTRAST "HighContrast"
 
-#define REWIND_MSEC (-10 * 1000)
-#define FASTFORWARD_MSEC (45 * 1000)
+#define REWIND_USEC (-10 * G_USEC_PER_SEC)
+#define FASTFORWARD_USEC (45 * G_USEC_PER_SEC)
 
 #define VOLUME_STEP "volume-step"
 #define VOLUME_STEP_PRECISE 2
@@ -1719,12 +1719,12 @@ do_multimedia_player_action (GsdMediaKeysManager *manager,
 
         if (mpris_controller_get_has_active_player (priv->mpris_controller)) {
                 if (g_str_equal (key, "Rewind")) {
-                        if (mpris_controller_seek (priv->mpris_controller, REWIND_MSEC))
+                        if (mpris_controller_seek (priv->mpris_controller, REWIND_USEC))
                                 return TRUE;
                 } else if (g_str_equal (key, "FastForward")) {
-                        if (mpris_controller_seek (priv->mpris_controller, FASTFORWARD_MSEC))
+                        if (mpris_controller_seek (priv->mpris_controller, FASTFORWARD_USEC))
                                 return TRUE;
-                } else if (g_str_equal (key, "LoopStatus")) {
+                } else if (g_str_equal (key, "Repeat")) {
                         if (mpris_controller_toggle (priv->mpris_controller, "LoopStatus"))
                                 return TRUE;
                 } else if (g_str_equal (key, "Shuffle")) {
diff --git a/plugins/media-keys/mpris-controller.c b/plugins/media-keys/mpris-controller.c
index de113adb1447aad92088c5e022ce19fb8b85d4c1..d60d362ec1ab932fb36aef3f34f9be67b9a72c36 100644
--- a/plugins/media-keys/mpris-controller.c
+++ b/plugins/media-keys/mpris-controller.c
@@ -149,7 +149,7 @@ mpris_controller_toggle (MprisController *self, const gchar *property)
   if (!self->mpris_client_proxy)
     return FALSE;
 
-  if (g_str_equal (property, "Repeat")) {
+  if (g_str_equal (property, "LoopStatus")) {
     g_autoptr(GDBusProxy) props = NULL;
     g_autoptr(GVariant) loop_status;
     const gchar *status_str, *new_status;