diff --git a/js/actionCreators.js b/js/actionCreators.js
index ad2cafde..6e2534fc 100644
--- a/js/actionCreators.js
+++ b/js/actionCreators.js
@@ -61,6 +61,11 @@ export function adjustVolume(mediaPlayer, volumeDiff) {
   };
 }
 
+export function toggleRepeat(mediaPlayer) {
+  mediaPlayer.toggleRepeat();
+  return {type: 'TOGGLE_REPEAT'};
+}
+
 export function setSkinFromFile(skinFile) {
   return (dispatch) => {
     dispatch({type: 'START_LOADING'});
diff --git a/js/components/MainWindow.jsx b/js/components/MainWindow.jsx
index 2f0bdf7b..50f2e1ee 100644
--- a/js/components/MainWindow.jsx
+++ b/js/components/MainWindow.jsx
@@ -86,7 +86,7 @@ const MainWindow = (props) => {
         <Eject />
         <div className='shuffle-repeat'>
           <Shuffle />
-          <Repeat />
+          <Repeat mediaPlayer={props.mediaPlayer} />
         </div>
         <a id='about' target='blank' href='https://github.com/captbaritone/winamp2-js' />
       </div>
diff --git a/js/components/Repeat.jsx b/js/components/Repeat.jsx
index 0fad4347..0b308f8e 100644
--- a/js/components/Repeat.jsx
+++ b/js/components/Repeat.jsx
@@ -1,6 +1,8 @@
 import React from 'react';
 import {connect} from 'react-redux';
 
+import {toggleRepeat} from '../actionCreators';
+
 
 class Repeat extends React.Component {
   constructor(props) {
@@ -8,7 +10,7 @@ class Repeat extends React.Component {
     this.handleClick = this.handleClick.bind(this);
   }
   handleClick() {
-    this.props.dispatch({type: 'TOGGLE_REPEAT'});
+    this.props.dispatch(toggleRepeat(this.props.mediaPlayer));
   }
   render() {
     return <div
diff --git a/js/hotkeys.js b/js/hotkeys.js
index aa7ab568..ba13cf66 100644
--- a/js/hotkeys.js
+++ b/js/hotkeys.js
@@ -1,4 +1,4 @@
-import {play, pause, stop, adjustVolume} from './actionCreators';
+import {play, pause, stop, adjustVolume, toggleRepeat} from './actionCreators';
 
 module.exports = function(winamp, store) {
   let keylog = [];
@@ -30,7 +30,8 @@ module.exports = function(winamp, store) {
         case 67: store.dispatch(pause(winamp.media)); break;
         // L
         case 76: store.dispatch({type: 'OPEN_FILE_DIALOG'}); break;
-        case 82: winamp.toggleRepeat(); break;        // R
+        // R
+        case 82: store.dispatch(toggleRepeat(winamp.media)); break;
         case 83: winamp.toggleShuffle(); break;       // S
         // V
         case 86: store.dispatch(stop(winamp.media)); break;
diff --git a/js/reducers.js b/js/reducers.js
index 8ba7e1c0..fa449b89 100644
--- a/js/reducers.js
+++ b/js/reducers.js
@@ -151,9 +151,6 @@ const createReducer = (winamp) => {
         // TODO: Figure out how to make this pure
         winamp.openFileDialog();
         return state;
-      case 'TOGGLE_REPEAT':
-        winamp.toggleRepeat();
-        return state;
       case 'TOGGLE_SHUFFLE':
         winamp.toggleShuffle();
         return state;
diff --git a/js/winamp.js b/js/winamp.js
index 0c309cbc..56985886 100755
--- a/js/winamp.js
+++ b/js/winamp.js
@@ -56,10 +56,6 @@ module.exports = {
     this.media.seekToTime(this.media.timeElapsed() + seconds);
   },
 
-  toggleRepeat: function() {
-    this.media.toggleRepeat();
-  },
-
   toggleShuffle: function() {
     this.media.toggleShuffle();
   },