diff --git a/gui/main.cpp b/gui/main.cpp
index 45abe38b..527a8b2f 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -19,9 +19,10 @@ Gtk::Window *ocarina_init(int *argc, char ***argv)
 #ifndef CONFIG_TEST
 int main(int argc, char **argv)
 {
-	Gtk::Main ocarina(&argc, &argv);
+	Glib::RefPtr<Gtk::Application> ocarina = Gtk::Application::create(argc, argv, "ocarina");
+
 	Gtk::Window *window = ocarina_init(&argc, &argv);
-	Gtk::Main::run(*window);
+	ocarina->run(*window);
 	cleanup_tabs();
 	return 0;
 }