diff --git a/changes/changelog.d/150.enhancement b/changes/changelog.d/150.enhancement
new file mode 100644
index 000000000..419b0a4b2
--- /dev/null
+++ b/changes/changelog.d/150.enhancement
@@ -0,0 +1 @@
+Player is back in Queue tab (#150)
diff --git a/front/src/components/Sidebar.vue b/front/src/components/Sidebar.vue
index b751dae7b..fb4074d80 100644
--- a/front/src/components/Sidebar.vue
+++ b/front/src/components/Sidebar.vue
@@ -49,8 +49,6 @@
           class="item" v-if="$store.state.auth.availablePermissions['federation.manage']"
           :to="{path: '/manage/federation/libraries'}"><i class="sitemap icon"></i> {{ $t('Federation') }}</router-link>
       </div>
-
-      <player></player>
     </div>
     <div v-if="queue.previousQueue " class="ui black icon message">
       <i class="history icon"></i>
@@ -90,7 +88,6 @@
           </draggable>
       </table>
       <div v-if="$store.state.radios.running" class="ui black message">
-
         <div class="content">
           <div class="header">
             <i class="feed icon"></i> {{ $t('You have a radio playing') }}
@@ -101,6 +98,7 @@
       </div>
     </div>
   </div>
+  <player @next="scrollToCurrent" @previous="scrollToCurrent"></player>
 </div>
 </template>
 
diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue
index 28ace8287..c475ec684 100644
--- a/front/src/components/audio/Player.vue
+++ b/front/src/components/audio/Player.vue
@@ -173,11 +173,21 @@ export default {
     ...mapActions({
       togglePlay: 'player/togglePlay',
       clean: 'queue/clean',
-      next: 'queue/next',
-      previous: 'queue/previous',
       shuffle: 'queue/shuffle',
       updateProgress: 'player/updateProgress'
     }),
+    next () {
+      let self = this
+      this.$store.dispatch('queue/next').then(() => {
+        self.$emit('next')
+      })
+    },
+    previous () {
+      let self = this
+      this.$store.dispatch('queue/previous').then(() => {
+        self.$emit('previous')
+      })
+    },
     touchProgress (e) {
       let time
       let target = this.$refs.progress