diff --git a/syncplay/client.py b/syncplay/client.py
index 3d135e9..aa5a7f3 100644
--- a/syncplay/client.py
+++ b/syncplay/client.py
@@ -156,6 +156,9 @@ class SyncplayClient(object):
             return False
         return True
 
+    def playlistUpdate(self, newPlaylist):
+        print newPlaylist
+
     def _determinePlayerStateChange(self, paused, position):
         pauseChange = self.getPlayerPaused() != paused and self.getGlobalPaused() != paused
         _playerDiff = abs(self.getPlayerPosition() - position)
diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py
index bdf6206..529862c 100644
--- a/syncplay/ui/gui.py
+++ b/syncplay/ui/gui.py
@@ -86,6 +86,7 @@ class UserlistItemDelegate(QtGui.QStyledItemDelegate):
 
 class MainWindow(QtGui.QMainWindow):
     insertPosition = None
+    playlistState = []
 
     def setPlaylistInsertPosition(self, newPosition):
         if MainWindow.insertPosition <> newPosition:
@@ -111,6 +112,7 @@ class MainWindow(QtGui.QMainWindow):
             itemQPainter.restore()
 
     class PlaylistGroupBox(QtGui.QGroupBox):
+
         def dragEnterEvent(self, event):
             data = event.mimeData()
             urls = data.urls()
@@ -146,10 +148,30 @@ class MainWindow(QtGui.QMainWindow):
                 super(MainWindow.PlaylistWidget, self).dropEvent(event)
 
     class PlaylistWidget(QtGui.QListWidget):
+        selfWindow = None
+
+        def setWindow(self, window):
+            self.selfWindow = window
+
         def dragLeaveEvent(self, event):
             window = self.parent().parent().parent().parent().parent().parent()
             window.setPlaylistInsertPosition(None)
 
+        def rowsMoved(self, sourceParent, sourceStart, sourceEnd, destinationParent, destinationRow):
+            if self.selfWindow:
+                super(MainWindow.PlaylistWidget, self).rowsMoved(sourceParent, sourceStart, sourceEnd, destinationParent, destinationRow)
+                self.selfWindow.playlistUpdated()
+
+        def rowsInserted(self, parent, start, end):
+            if self.selfWindow:
+                super(MainWindow.PlaylistWidget, self).rowsInserted(parent, start, end)
+                self.selfWindow.playlistUpdated()
+
+        def rowsRemoved(self, parent, start, end):
+            if self.selfWindow:
+                super(MainWindow.PlaylistWidget, self).rowsRemoved(parent, start, end)
+                self.selfWindow.playlistUpdated()
+
         def forceUpdate(self):
             root = self.rootIndex()
             self.dataChanged(root, root)
@@ -163,6 +185,7 @@ class MainWindow(QtGui.QMainWindow):
         def _remove_selected_items(self):
             for item in self.selectedItems():
                 self.takeItem(self.row(item))
+                self.selfWindow.playlistUpdated()
 
         def dragEnterEvent(self, event):
             data = event.mimeData()
@@ -207,6 +230,7 @@ class MainWindow(QtGui.QMainWindow):
                         window.addFolderToPlaylist(dropfilepath)
             else:
                 super(MainWindow.PlaylistWidget, self).dropEvent(event)
+            self.selfWindow.playlistUpdated()
 
     class FileSwitchManager(object):
         def __init__(self):
@@ -771,6 +795,20 @@ class MainWindow(QtGui.QMainWindow):
     def drop(self):
         self.close()
 
+    def getPlaylistState(self):
+        playlistItems = []
+        for playlistItem in xrange(self.playlist.count()):
+            platlistItemText = self.playlist.item(playlistItem).text()
+            if platlistItemText <> u"Drag file here to add it to the shared playlist.":
+                playlistItems.append(platlistItemText)
+        return playlistItems
+
+    def playlistUpdated(self):
+        newPlaylist = self.getPlaylistState()
+        if newPlaylist <> self.playlistState and self._syncplayClient:
+            self.playlistState = newPlaylist
+            self._syncplayClient.playlistUpdate(newPlaylist)
+
     def addTopLayout(self, window):
         window.topSplit = self.topSplitter(Qt.Horizontal, self)
 
@@ -861,6 +899,7 @@ class MainWindow(QtGui.QMainWindow):
         window.playlistGroup.setSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
         window.playlistGroup.setAcceptDrops(True)
         window.playlist = self.PlaylistWidget()
+        window.playlist.setWindow(window)
         window.playlist.setItemDelegate(self.PlaylistItemDelegate())
         window.playlist.setDragEnabled(True)
         window.playlist.setAcceptDrops(True)