2 files changed, 5 insertions, 3 deletions

diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index 8c17a8730e4a..15633d608133 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -256,10 +256,9 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
                          int refresh)
 {
         struct objdump_line *pos, *n;
-        struct annotation *notes = symbol__annotation(sym);
+        struct annotation *notes;
         struct annotate_browser browser = {
                 .b = {
-                        .entries = &notes->src->source,
                         .refresh = ui_browser__list_head_refresh,
                         .seek    = ui_browser__list_head_seek,
                         .write   = annotate_browser__write,
@@ -281,6 +280,8 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
 
         ui_helpline__push("Press <- or ESC to exit");
 
+        notes = symbol__annotation(sym);
+
         list_for_each_entry(pos, &notes->src->source, node) {
                 struct objdump_line_rb_node *rbpos;
                 size_t line_len = strlen(pos->line);
@@ -291,6 +292,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
                 rbpos->idx = browser.b.nr_entries++;
         }
 
+        browser.b.entries = &notes->src->source,
         browser.b.width += 18; /* Percentage */
         ret = annotate_browser__run(&browser, evidx, refresh);
         list_for_each_entry_safe(pos, n, &notes->src->source, node) {
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index 798efdca3ead..5d767c622dfc 100644
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -851,7 +851,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel,
                         goto out_free_stack;
                 case 'a':
                         if (browser->selection == NULL ||
-                            browser->selection->map == NULL ||
+                            browser->selection->sym == NULL ||
                             browser->selection->map->dso->annotate_warned)
                                 continue;
                         goto do_annotate;