diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp
index c27e9711e..d9dcc0ad0 100644
--- a/src/playlist/playlistview.cpp
+++ b/src/playlist/playlistview.cpp
@@ -411,6 +411,7 @@ void PlaylistView::scrollContentsBy(int dx, int dy) {
   if (dx) {
     InvalidateCachedCurrentPixmap();
   }
+  cached_tree_ = QPixmap();
 
   QTreeView::scrollContentsBy(dx, dy);
 
@@ -456,11 +457,28 @@ void PlaylistView::JumpToCurrentlyPlayingTrack() {
 
 void PlaylistView::paintEvent(QPaintEvent* event) {
   // Reimplemented to draw the drop indicator
-  QPainter p(viewport());
-  drawTree(&p, event->region());
+  // When the user is dragging some stuff over the playlist paintEvent gets
+  // called for the entire viewport every time the user moves the mouse.
+  // The drawTree is kinda expensive, so we cache the result and draw from the
+  // cache while the user is dragging.  The cached pixmap gets invalidated in
+  // dragLeaveEvent, dropEvent and scrollContentsBy.
 
-  if (drop_indicator_row_ == -1)
+  QPainter p(viewport());
+
+  if (drop_indicator_row_ != -1) {
+    if (cached_tree_.isNull()) {
+      cached_tree_ = QPixmap(size());
+      cached_tree_.fill(Qt::transparent);
+
+      QPainter cache_painter(&cached_tree_);
+      drawTree(&cache_painter, event->region());
+    }
+
+    p.drawPixmap(0, 0, cached_tree_);
+  } else {
+    drawTree(&p, event->region());
     return;
+  }
 
   // Find the y position of the drop indicator
   QModelIndex drop_index = model()->index(drop_indicator_row_, 0);
@@ -516,12 +534,19 @@ void PlaylistView::dragMoveEvent(QDragMoveEvent *event) {
   drop_indicator_row_ = index.isValid() ? index.row() : 0;
 }
 
+void PlaylistView::dragEnterEvent(QDragEnterEvent *event) {
+  QTreeView::dragEnterEvent(event);
+  cached_tree_ = QPixmap();
+}
+
 void PlaylistView::dragLeaveEvent(QDragLeaveEvent *event) {
   QTreeView::dragLeaveEvent(event);
+  cached_tree_ = QPixmap();
   drop_indicator_row_ = -1;
 }
 
 void PlaylistView::dropEvent(QDropEvent *event) {
   QTreeView::dropEvent(event);
+  cached_tree_ = QPixmap();
   drop_indicator_row_ = -1;
 }
diff --git a/src/playlist/playlistview.h b/src/playlist/playlistview.h
index e7f68e631..d8d6c91fd 100644
--- a/src/playlist/playlistview.h
+++ b/src/playlist/playlistview.h
@@ -61,6 +61,7 @@ class PlaylistView : public QTreeView {
   void scrollContentsBy(int dx, int dy);
   void paintEvent(QPaintEvent *event);
   void dragMoveEvent(QDragMoveEvent *event);
+  void dragEnterEvent(QDragEnterEvent *event);
   void dragLeaveEvent(QDragLeaveEvent *event);
   void dropEvent(QDropEvent *event);
 
@@ -112,6 +113,7 @@ class PlaylistView : public QTreeView {
   QRect cached_current_row_rect_;
   int cached_current_row_row_;
 
+  QPixmap cached_tree_;
   int drop_indicator_row_;
 };