diff --git a/public/templates/partials/delete-playlist-track-dialog.html b/public/templates/partials/delete-playlist-track-dialog.html
new file mode 100644
index 00000000..adca48ea
--- /dev/null
+++ b/public/templates/partials/delete-playlist-track-dialog.html
@@ -0,0 +1,17 @@
+<div class="modal" tabindex="-1" role="dialog">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header" ng-show="title">
+                <button type="button" class="close" ng-click="$hide()">&times;</button>
+                <h4 class="modal-title">Remove {{ track.title }} from playlist</h4>
+            </div>
+            <div class="modal-body">
+                <p>Are you sure you want to delete {{ track.title }}?</p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-danger" ng-click="confirmDeleteTrack();$hide()">Yes</button>
+                <button type="button" class="btn btn-primary" ng-click="$hide()">No</button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/resources/assets/scripts/app/directives/tracks-list.coffee b/resources/assets/scripts/app/directives/tracks-list.coffee
index 9ab15fd4..ae57ecdd 100644
--- a/resources/assets/scripts/app/directives/tracks-list.coffee
+++ b/resources/assets/scripts/app/directives/tracks-list.coffee
@@ -32,16 +32,16 @@ module.exports = angular.module('ponyfm').directive 'pfmTracksList', () ->
                 $scope.playlist and $scope.auth.isLogged and $scope.playlist.user.id == $scope.auth.user.id
 
             $scope.removeFromPlaylist = (track) ->
-                #$dialog.messageBox "Remove #{track.title} from playlist",
-                #    "Are you sure you want to delete \"#{track.title}\"?", [
-                #        { result: 'ok', label: 'Yes', cssClass: 'btn-danger' },
-                #        { result: 'cancel', label: 'No', cssClass: 'btn-primary' }
-                #    ]
-                #.open().then (res) ->
-                #    return if res is 'cancel'
-                #    playlists.removeTrackFromPlaylist $scope.playlist?.id, track.id
-                #    .done ->
-                #        $scope.tracks = _.reject $scope.tracks, (t) -> t.id == track.id
+                $scope.track = track
+                dialog = $modal
+                    templateUrl: '/templates/partials/delete-playlist-track-dialog.html'
+                    scope: $scope,
+                    show: true
+
+            $scope.confirmDeleteTrack = () ->
+                playlists.removeTrackFromPlaylist $scope.playlist?.id, $scope.track.id
+                .done ->
+                    $scope.tracks = _.reject $scope.tracks, (t) -> t.id == $scope.track.id
 
             $scope.toggleFavourite = (track) ->
                 favourites.toggle('track', track.id).done (res) ->