diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index 8a80fcbd04..30334c0664 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -150,10 +150,10 @@
 				log_econ("[queuecost] credits were inserted into [src] by [key_name(usr)] (ID: [C.registered_name]) to queue [selectedtrack.song_name].")
 			queuedplaylist += selectedtrack
 			if(active)
-				say("[selectedtrack.song_name] has been added to the queue!")
-				playsound(src, 'sound/machines/ping.ogg', 50, TRUE)
+				say("[selectedtrack.song_name] has been added to the queue.")
 			else if(!playing)
 				activate_music()
+			playsound(src, 'sound/machines/ping.ogg', 50, TRUE)
 			queuecooldown = world.time + (3 SECONDS)
 			return TRUE
 		if("select_track")
@@ -193,6 +193,8 @@
 		START_PROCESSING(SSobj, src)
 		stop = world.time + playing.song_length
 		queuedplaylist.Cut(1, 2)
+		say("Now playing: [playing.song_name]")
+		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, TRUE)
 		return TRUE
 	else
 		return FALSE
diff --git a/tgui/packages/tgui/interfaces/Jukebox.js b/tgui/packages/tgui/interfaces/Jukebox.js
index e71d38ac1d..ebae6bfb28 100644
--- a/tgui/packages/tgui/interfaces/Jukebox.js
+++ b/tgui/packages/tgui/interfaces/Jukebox.js
@@ -44,12 +44,6 @@ export const Jukebox = (props, context) => {
                 <LabeledList.Item label="Track Length">
                   {track_selected ? track_length : "No Track Selected"}
                 </LabeledList.Item>
-                <LabeledList.Item />
-                <LabeledList.Item />
-                <LabeledList.Item />
-                <LabeledList.Item label="Cost to Queue">
-                  {cost_for_play} CR {has_access ? "(Cost waived)" : ""}
-                </LabeledList.Item>
               </LabeledList>
             </Stack.Item>
             <Stack.Item>
@@ -107,6 +101,11 @@ export const Jukebox = (props, context) => {
               </LabeledControls>
             </Stack.Item>
           </Stack>
+          <LabeledList>
+            <LabeledList.Item label="Cost to Queue">
+              {cost_for_play} CR {has_access ? "(Cost waived)" : ""}
+            </LabeledList.Item>
+          </LabeledList>
         </Section>
         <Section fill vertical>
           <Stack>