1 files changed, 5 insertions, 1 deletions

diff --git a/tools/perf/ui/gtk/setup.c b/tools/perf/ui/gtk/setup.c
index 92879ce61e2f..3c4c6ef78283 100644
--- a/tools/perf/ui/gtk/setup.c
+++ b/tools/perf/ui/gtk/setup.c
@@ -7,11 +7,15 @@ extern struct perf_error_ops perf_gtk_eops;
 int perf_gtk__init(void)
 {
         perf_error__register(&perf_gtk_eops);
+        perf_gtk__init_helpline();
+        perf_gtk__init_hpp();
         return gtk_init_check(NULL, NULL) ? 0 : -1;
 }
 
-void perf_gtk__exit(bool wait_for_ok __used)
+void perf_gtk__exit(bool wait_for_ok __maybe_unused)
 {
+        if (!perf_gtk__is_active_context(pgctx))
+                return;
         perf_error__unregister(&perf_gtk_eops);
         gtk_main_quit();
 }