diff --git a/init.el b/init.el
index 177dfb0..51d4277 100644
--- a/init.el
+++ b/init.el
@@ -893,11 +893,14 @@ _h_   _l_   _o_k        _y_ank
              db/play-playlist
              emms-cache-save
              emms-play-directory-tree
-             emms-control/body))
+             emms-control/body)
+  :config (setq db/personal-playlist
+                (expand-file-name "private/playlist-daniel.pls" emacs-d)))
 
 (use-package helm-emms
   :commands (helm-emms)
   :config (progn
+            (require 'db-emms)
             (require 'helm-adaptive)
             (setq helm-emms-default-sources
                   '(helm-source-emms-streams
diff --git a/site-lisp/db-emms.el b/site-lisp/db-emms.el
index 2d5b1a5..4fcd060 100644
--- a/site-lisp/db-emms.el
+++ b/site-lisp/db-emms.el
@@ -16,6 +16,9 @@
 
 ;; Basic configuration
 
+(defvar db/personal-playlist nil
+  "Personal playlist.")
+
 (setq emms-source-file-default-directory "~/Documents/media/audio/")
 
 (defadvice emms-tag-editor-submit (after delete-window activate)
@@ -46,9 +49,8 @@
         (emms-playlist-current-clear)
         (emms-playlist-current-insert-source
          'emms-insert-playlist
-         (expand-file-name "private/playlist-daniel.pls"
-                           emacs-d))
-        (beginning-of-buffer)
+         db/personal-playlist)
+        (goto-char (point-min))
         (emms-shuffle)
         ;; (emms-playlist-sort-by-play-count)
         (emms-playlist-select-first)