diff --git a/gnome-music.doap b/gnome-music.doap
index 1fb9cdcc9b5e4ee07ea415bf55afbe9632d7181a..70712ff5ed50f564ad96ac993c408d4e85acbd7b 100644
--- a/gnome-music.doap
+++ b/gnome-music.doap
@@ -20,6 +20,8 @@
       <foaf:name>Marinus Schraal</foaf:name>
       <foaf:mbox rdf:resource="mailto:mschraal@gnome.org" />
       <gnome:userid>mschraal</gnome:userid>
+<<<<<<< HEAD
+=======
     </foaf:Person>
   </maintainer>
   <maintainer>
@@ -27,6 +29,7 @@
       <foaf:name>Jean Felder</foaf:name>
       <foaf:mbox rdf:resource="mailto:jfelder@gnome.org" />
       <gnome:userid>jfelder</gnome:userid>
+>>>>>>> upstream/master
     </foaf:Person>
   </maintainer>
 </Project>
diff --git a/gnomemusic/widgets/playertoolbar.py b/gnomemusic/widgets/playertoolbar.py
index e5de8064a2d7b2f0232fc7770a207ad71b07ad43..d6f932334be998976f6a8f7c6cc84d9506f74f94 100644
--- a/gnomemusic/widgets/playertoolbar.py
+++ b/gnomemusic/widgets/playertoolbar.py
@@ -64,9 +64,9 @@ class PlayerToolbar(Gtk.ActionBar):
         return '<PlayerToolbar>'
 
     @log
-    def __init__(self, player):
+    def __init__(self, player, headerbar):
         super().__init__()
-
+        self._headerbar = headerbar
         self._player = player
         self._progress_scale.player = self._player.get_gst_player()
 
@@ -74,7 +74,7 @@ class PlayerToolbar(Gtk.ActionBar):
         self._cover_stack.connect('updated', self._on_cover_stack_updated)
 
         self._sync_repeat_image()
-
+        self._headerbar.connect('notify::selection-mode', self._on_selection_mode_changed)
         self._player.connect('clock-tick', self._on_clock_tick)
         self._player.connect('song-changed', self._update_view)
         self._player.connect('prev-next-invalidated', self._sync_prev_next)
@@ -92,6 +92,13 @@ class PlayerToolbar(Gtk.ActionBar):
         seconds = int(progress_scale.get_value() / 60)
         self._progress_time_label.set_label(utils.seconds_to_string(seconds))
 
+    @log
+    def _on_selection_mode_changed(self, headerbar, selection_mode):
+        if headerbar.props.selection_mode:
+            self.hide()
+        else:
+            self.show()
+
     @log
     def _on_cover_stack_updated(self, klass):
         self.emit('thumbnail-updated')
@@ -130,7 +137,7 @@ class PlayerToolbar(Gtk.ActionBar):
 
     @log
     def _sync_playing(self, player):
-        self.show()
+        #self.show()
 
         if self._player.get_playback_status() == Playback.PLAYING:
             image = self._pause_image
diff --git a/gnomemusic/window.py b/gnomemusic/window.py
index 58421e581e0f72d068bcf8ae4319746060439da1..067f1ef7ba64a504d0e99b1dfa850bfe8726028d 100644
--- a/gnomemusic/window.py
+++ b/gnomemusic/window.py
@@ -209,9 +209,9 @@ class Window(Gtk.ApplicationWindow):
     def _setup_view(self):
         self._box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
         self.player = Player(self)
-        self.player_toolbar = PlayerToolbar(self.player)
         self.selection_toolbar = SelectionToolbar()
         self.headerbar = HeaderBar()
+        self.player_toolbar = PlayerToolbar(self.player, self.headerbar)
         self.views = [None] * len(View)
         self._stack = Gtk.Stack(
             transition_type=Gtk.StackTransitionType.CROSSFADE,