diff --git a/gui/gst.cpp b/gui/gst.cpp
index e58e5925..c99d68a7 100644
--- a/gui/gst.cpp
+++ b/gui/gst.cpp
@@ -17,7 +17,6 @@ extern "C" {
 static GtkButton *o_pause;
 static GtkButton *o_play;
 static GtkScale  *o_seek;
-static GtkButton *o_stop;
 
 static GtkSpinButton  *o_count;
 static GtkToggleButton *o_enabled;
@@ -126,7 +125,6 @@ static bool on_timeout()
 
 void gst :: play()  { audio_play();  }
 void gst :: pause() { audio_pause(); }
-void gst :: stop()  { audio_stop();  }
 
 void gst :: toggle()
 {
@@ -140,7 +138,6 @@ void gst :: init_pre()
 {
 	o_pause = GTK_BUTTON(gui_builder_widget("o_pause"));
 	o_play  = GTK_BUTTON(gui_builder_widget("o_play"));
-	o_stop  = GTK_BUTTON(gui_builder_widget("o_stop"));
 	o_seek  = GTK_SCALE(gui_builder_widget("o_seek"));
 
 	o_count   = GTK_SPIN_BUTTON(gui_builder_widget("o_pause_count"));
@@ -156,7 +153,6 @@ void gst :: init_pre()
 	g_signal_connect(o_pause, "clicked", gst :: pause, NULL);
 	g_signal_connect(o_play, "clicked", gst :: play, NULL);
 	g_signal_connect(o_seek, "change-value", G_CALLBACK(on_seek), NULL);
-	g_signal_connect(o_stop, "clicked", gst :: stop, NULL);
 
 	g_signal_connect(o_count, "changed", G_CALLBACK(on_pause_count), NULL);
 	g_signal_connect(o_enabled, "toggled", G_CALLBACK(on_pause_enabled), NULL);
diff --git a/include/gui/ocarina.h b/include/gui/ocarina.h
index 84091755..a474deb9 100644
--- a/include/gui/ocarina.h
+++ b/include/gui/ocarina.h
@@ -29,7 +29,6 @@ namespace gst
 {
 	void play();
 	void pause();
-	void stop();
 	void toggle();
 	void init_pre();
 	void init();
diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade
index f6309ce7..b71d3246 100644
--- a/share/ocarina/ocarina6.glade
+++ b/share/ocarina/ocarina6.glade
@@ -582,6 +582,7 @@ Manager</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">True</property>
                         <property name="focus_on_click">False</property>
+                        <signal name="clicked" handler="audio_stop" swapped="no"/>
                         <child>
                           <object class="GtkImage" id="image3">
                             <property name="visible">True</property>