diff --git a/src/actions.js b/src/actions.js
index 87721d4e..e7a49dea 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -14,6 +14,7 @@ var actions = {
     volume_up: ['Up'],
     volume_down: ['Down'],
     toggle_play: ['space'],
+    change_repeat: ['<Ctrl>r'],
     reveal_controls: ['Return'],
     toggle_fullscreen: ['F11', 'f'],
     quit: ['<Ctrl>q', 'q'],
@@ -72,6 +73,9 @@ function handleAction(action, window)
         case 'toggle_fullscreen':
             clapperWidget.toggleFullscreen();
             break;
+        case 'change_repeat':
+            player.playlistWidget.changeRepeatMode();
+            break;
         case 'quit':
             clapperWidget.root.emit('close-request');
             break;
diff --git a/src/playlist.js b/src/playlist.js
index c7093be5..c16820b0 100644
--- a/src/playlist.js
+++ b/src/playlist.js
@@ -1,4 +1,7 @@
 const { Gdk, GLib, GObject, Gst, Gtk, Pango } = imports.gi;
+const Debug = imports.src.debug;
+
+const { debug, warn } = Debug;
 
 var RepeatMode = {
     NONE: 0,
@@ -90,6 +93,26 @@ class ClapperPlaylistWidget extends Gtk.ListBox
         button.icon_name = 'list-remove-symbolic';
     }
 
+    changeRepeatMode(mode)
+    {
+        const lastMode = Object.keys(RepeatMode).length - 1;
+
+        if(mode < 0 || mode > lastMode) {
+            warn(`ignored invalid repeat mode value: ${mode}`);
+            return;
+        }
+
+        if(mode >= 0)
+            this.repeatMode = mode;
+        else {
+            this.repeatMode++;
+            if(this.repeatMode > lastMode)
+                this.repeatMode = 0;
+        }
+
+        debug(`set repeat mode: ${this.repeatMode}`);
+    }
+
     _switchTrack(isPrevious)
     {
         const rowId = (isPrevious)
@@ -134,6 +157,8 @@ class ClapperPlaylistWidget extends Gtk.ListBox
             && this.activeRowId === 0
             && !this.get_row_at_index(1))
         ) {
+            debug('seeking to beginning');
+
             player.seek(0);
             return true;
         }