diff --git a/libsaria/audio/__init__.py b/libsaria/audio/__init__.py
index 99628867..330e568c 100644
--- a/libsaria/audio/__init__.py
+++ b/libsaria/audio/__init__.py
@@ -39,9 +39,9 @@ def load(file):
 	return call("LOAD", audio.load, file)
 
 
-def stop():
-	global audio
-	return call("STOP", audio.stop)
+#def stop():
+#	global audio
+#	return call("STOP", audio.stop)
 
 
 def seek(prcnt):
diff --git a/libsaria/controls.py b/libsaria/controls.py
index c45720f3..3d600214 100644
--- a/libsaria/controls.py
+++ b/libsaria/controls.py
@@ -21,3 +21,6 @@ def play():
 
 def pause():
 	return call("PAUSE", audio.pause)
+
+def stop():
+	return call("STOP", audio.stop)
diff --git a/ocarina/components/button.py b/ocarina/components/button.py
index 46c6409b..c6c64310 100644
--- a/ocarina/components/button.py
+++ b/ocarina/components/button.py
@@ -66,7 +66,7 @@ class StopButton(Button):
 	def __init__(self):
 		Button.__init__(self, gtk.STOCK_MEDIA_STOP)
 	def clicked(self, button):
-		LS.audio.stop()
+		LS.controls.stop()
 
 
 class NextButton(Button):