       (:ui.nation/mouse-on (:ui/nation ui))))
 
 (defn set-tab [ui tab]
-  (assoc ui :ui/selected-tab tab))
+  (assoc-in ui [:ui/player :player/selected-tab] tab))
 
 (defn focus-nation [ui nation]
   (assoc-in ui [:ui/nation :ui.nation/mouse-on] nation))

(s/def :data/ui 
  (s/keys :req [:ui/player
                :ui/nation
                :ui/composer
                :ui/selected-tab]))

(s/def :ui/selected-tab #{:selection :queue})

(s/def :ui/nation
  (s/keys :req [:ui.nation/mouse-on

                       :player/track-list
                       :player/paused
                       :player/playing
                       :player/shuffle-memory
                       :player/selected-tab])
         (fn [{playing :player/playing q :player/queue}]
           (if playing
             (contains? (into #{} (map :track/id) q) (:track/id playing))
