diff --git a/ocarina/body/button.py b/ocarina/body/button.py
index 62e2568a..7c387d70 100644
--- a/ocarina/body/button.py
+++ b/ocarina/body/button.py
@@ -76,10 +76,16 @@ def stop_button(show):
 def next_button(show):
 	return make_button(gtk.STOCK_MEDIA_NEXT, controls.next, "Next", show)
 
-def goto_button(goto_func, show):
+def goto_button(show):
+	def goto_func():
+		from ocarina import body
+		body.cur_page_goto()
 	return make_button(gtk.STOCK_JUMP_TO, goto_func, "Go To Current Song", show)
 
-def clear_button(clear_func, show):
+def clear_button(show):
+	def clear_func():
+		from ocarina import body
+		body.cur_page_clear()
 	return make_button(gtk.STOCK_CLEAR, clear_func, "Clear Current Source", show)
 
 def random_button(is_active, show):
diff --git a/ocarina/body/header/__init__.py b/ocarina/body/header/__init__.py
index f1139d57..a99d7e89 100644
--- a/ocarina/body/header/__init__.py
+++ b/ocarina/body/header/__init__.py
@@ -13,21 +13,13 @@ header.pack_start(header_body)
 header.pack_start(header_sep)
 header.show_all()
 
-def goto_func():
-	from ocarina import body
-	body.cur_page_goto()
-
-def clear_func():
-	from ocarina import body
-	body.cur_page_clear()
-
 def add_button(name, button):
 	globals()[name] = button
 	header_body.pack_start(button, False, False)
 
 header_body.pack_start(entry.entry)
-add_button(  "GOTO", button.goto_button(goto_func, True))
-add_button( "CLEAR", button.clear_button(clear_func, True))
+add_button(  "GOTO", button.goto_button(True))
+add_button( "CLEAR", button.clear_button(True))
 add_button("RANDOM", button.random_button(libsaria.prefs.get_pref("libsaria.random"), True))
 
 #import ocarina