diff --git a/CHANGELOG b/CHANGELOG
index 00ec2644..4d423ac5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 6.4.11:
+- Remove stop button
 - Move collection enabled checkboxes into a right click menu
 - Various UI tweaks
 
diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade
index fbb778eb..ceffef59 100644
--- a/share/ocarina/ocarina6.glade
+++ b/share/ocarina/ocarina6.glade
@@ -403,40 +403,6 @@
                     <property name="non_homogeneous">True</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkButton" id="o_stop">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Stop playback</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <signal name="can-activate-accel" handler="__audio_can_accel" swapped="no"/>
-                    <signal name="clicked" handler="audio_stop" swapped="no"/>
-                    <child>
-                      <object class="GtkImage" id="image3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">center</property>
-                        <property name="valign">center</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
-                        <property name="icon_name">media-playback-stop</property>
-                      </object>
-                    </child>
-                    <accelerator key="space" signal="clicked" modifiers="GDK_MOD1_MASK"/>
-                    <accelerator key="AudioPlay" signal="clicked" modifiers="GDK_MOD1_MASK"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">3</property>
-                    <property name="non_homogeneous">True</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkButton" id="o_next">
                     <property name="visible">True</property>
diff --git a/tests/gui/audio.c b/tests/gui/audio.c
index 77770762..8c9e8414 100644
--- a/tests/gui/audio.c
+++ b/tests/gui/audio.c
@@ -126,10 +126,6 @@ static void test_audio()
 			GTK_ADJUSTMENT(gui_builder_object("o_progress"))),
 			audio_cur_track()->tr_length);
 
-	test_click_button("o_stop");
-	test_equal(audio_cur_state(), GST_STATE_PAUSED);
-	test_equal(audio_position(), 0);
-
 	gui_window_deinit();
 	gui_builder_deinit();
 }