diff --git a/app/qml/mpris.qml b/app/qml/mpris.qml
index 5bc7777b..32dfdc12 100644
--- a/app/qml/mpris.qml
+++ b/app/qml/mpris.qml
@@ -1,157 +1,212 @@
 /*
  * Copyright 2015 Aleix Pol Gonzalez <aleixpol@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 import QtQuick 2.2
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.1
 import org.kde.kirigami 2.0 as Kirigami
 
 Kirigami.Page
 {
     id: root
     property QtObject pluginInterface
     property bool muted: false
+    property bool updatePositionSlider: true
     property int volumeUnmuted
     property var volume: pluginInterface.volume
+    property var lastPosition: pluginInterface.position
+    property date lastPositionTime: new Date()
     title: i18n("Multimedia Controls")
 
+    onLastPositionChanged: {
+        lastPositionTime = new Date();
+    }
+
     onVolumeChanged: {
         if (muted && volume != 0) {
             toggleMute()
             volumeUnmuted = volume
         } else if (!muted) {
             volumeUnmuted = volume
         }
     }
 
     function soundState(volume)
     {
         if (volume <= 25) {
             return "audio-volume-low"
         } else if (volume <= 75) {
             return "audio-volume-medium"
         } else {
             return "audio-volume-high"
         }
     }
 
-    function toggleMute() {
+    function toggleMute()
+    {
         muted = !muted
         root.pluginInterface.volume = muted ? 0 : volumeUnmuted
         muteButton.icon.name = muted ? "audio-volume-muted" : soundState(root.pluginInterface.volume)
     }
 
+    function msToTime(currentTime, totalTime)
+    {
+        if (totalTime.getHours() == 2) {
+            // Skip a day ahead as Date type's minimum is 1am on the 1st of January and can't go lower
+            currentTime.setDate(2)
+            currentTime.setHours(currentTime.getHours() - 1)
+            return currentTime.toLocaleTimeString(Qt.locale(),"hh:mm:ss")
+        } else {
+            return currentTime.toLocaleTimeString(Qt.locale(),"mm:ss")
+        }
+    }
+
+    Connections {
+        target: root.pluginInterface
+        onNowPlayingChanged: positionSlider.value = lastPosition
+    }
+
     Label {
         id: noPlayersText
         text: i18n("No players available")
         anchors.centerIn: parent
         visible: pluginInterface.playerList.length == 0
     }
 
     ColumnLayout
     {
         anchors.fill: parent
         visible: !noPlayersText.visible
 
         Component.onCompleted: {
             pluginInterface.requestPlayerList();
         }
 
         Item { Layout.fillHeight: true }
         ComboBox {
             Layout.fillWidth: true
             model: root.pluginInterface.playerList
             onCurrentTextChanged: root.pluginInterface.player = currentText
         }
         Label {
             id: nowPlaying
             Layout.fillWidth: true
             text: root.pluginInterface.nowPlaying
             visible: root.pluginInterface.title.length == 0
             wrapMode: Text.Wrap
         }
         Label {
             Layout.fillWidth: true
             text: root.pluginInterface.title
             visible: !nowPlaying.visible
             wrapMode: Text.Wrap
         }
         Label {
             Layout.fillWidth: true
             text: root.pluginInterface.artist
             visible: !nowPlaying.visible && !artistAlbum.visible && root.pluginInterface.artist.length > 0
             wrapMode: Text.Wrap
         }
         Label {
             Layout.fillWidth: true
             text: root.pluginInterface.album
             visible: !nowPlaying.visible && !artistAlbum.visible && root.pluginInterface.album.length > 0
             wrapMode: Text.Wrap
         }
         Label {
             id: artistAlbum
             Layout.fillWidth: true
             text: i18n("%1 - %2", root.pluginInterface.artist, root.pluginInterface.album)
             visible: !nowPlaying.visible && root.pluginInterface.album.length > 0 && root.pluginInterface.artist.length > 0
             wrapMode: Text.Wrap
         }
         RowLayout {
             Layout.fillWidth: true
             Button {
                 Layout.fillWidth: true
                 icon.name: "media-skip-backward"
                 onClicked: root.pluginInterface.sendAction("Previous")
             }
             Button {
                 Layout.fillWidth: true
                 icon.name: root.pluginInterface.isPlaying ? "media-playback-pause" : "media-playback-start"
                 onClicked: root.pluginInterface.sendAction("PlayPause");
             }
             Button {
                 Layout.fillWidth: true
                 icon.name: "media-skip-forward"
                 onClicked: root.pluginInterface.sendAction("Next")
             }
         }
+        RowLayout {
+            Layout.fillWidth: true
+            Label {
+                text: msToTime(new Date(positionSlider.value), new Date(root.pluginInterface.length))
+            }
+            Slider {
+                id: positionSlider
+                to: root.pluginInterface.length
+                Layout.fillWidth: true
+                Timer {
+                    id: positionUpdateTimer
+                    interval: 1000
+                    repeat: true
+                    running: updatePositionSlider && root.pluginInterface.isPlaying
+
+                    onTriggered: positionSlider.value = lastPosition + (new Date().getTime() - lastPositionTime.getTime())
+                }
+                onPressedChanged: {
+                    if (pressed) {
+                        updatePositionSlider = false
+                    } else {
+                        updatePositionSlider = true
+                        root.pluginInterface.position = value
+                    }
+                }
+            }
+            Label {
+                text: msToTime(new Date(root.pluginInterface.length), new Date(root.pluginInterface.length))
+            }
+        }
         RowLayout {
             Layout.fillWidth: true
             Button {
                 id: muteButton
                 icon.name: soundState(root.pluginInterface.volume)
                 onClicked: toggleMute()
             }
             Slider {
                 id: volumeSlider
                 value: volumeUnmuted
                 to: 99
                 enabled: !muted
                 Layout.fillWidth: true
                 onValueChanged: {
                     volumeUnmuted = value
                     root.pluginInterface.volume = value
                     muteButton.icon.name = soundState(root.pluginInterface.volume)
                 }
             }
         }
         Item { Layout.fillHeight: true }
     }
 
     Component.onCompleted: volumeUnmuted = root.pluginInterface.volume
 }