diff --git a/plugin/code_actions.py b/plugin/code_actions.py
index 69c7c784d..236db73d1 100644
--- a/plugin/code_actions.py
+++ b/plugin/code_actions.py
@@ -330,12 +330,11 @@ def _show_code_actions(self, actions: List[Tuple[ConfigName, CodeActionOrCommand
         window = self.view.window()
         if not window:
             return
-        items, selected_index = format_code_actions_for_quick_panel(actions)
-        window.show_quick_panel(
+        code_actions = [action[1] for action in actions]
+        items = [code_action["title"] for code_action in code_actions]
+        self.view.show_popup_menu(
             items,
-            lambda i: self._handle_select(i, actions),
-            selected_index=selected_index,
-            placeholder="Code action")
+            lambda i: self._handle_select(i, actions))
 
     def _handle_select(self, index: int, actions: List[Tuple[ConfigName, CodeActionOrCommand]]) -> None:
         if index == -1:
diff --git a/plugin/core/signature_help.py b/plugin/core/signature_help.py
index 62a4ceb80..3be61f99d 100644
--- a/plugin/core/signature_help.py
+++ b/plugin/core/signature_help.py
@@ -89,8 +89,7 @@ def select_signature(self, forward: bool) -> None:
         self._active_signature_index = max(0, min(new_index, len(self._signatures) - 1))
 
     def _render_intro(self) -> str:
-        fmt = '<p><div style="font-size: 0.9rem"><b>{}</b> of <b>{}</b> overloads ' + \
-              "(use ↑ ↓ to navigate, press Esc to hide):</div></p>"
+        fmt = '<p><div style="font-size: 0.9rem"><b>{}</b> of <b>{}</b></div></p>'
         return fmt.format(
             self._active_signature_index + 1,
             len(self._signatures),
diff --git a/plugin/hover.py b/plugin/hover.py
index 22046623a..4e822a1c3 100644
--- a/plugin/hover.py
+++ b/plugin/hover.py
@@ -340,13 +340,10 @@ def _on_navigate(self, href: str, point: int) -> None:
             if len(actions) > 1:
                 window = self.view.window()
                 if window:
-                    items, selected_index = format_code_actions_for_quick_panel(
-                        map(lambda action: (config_name, action), actions))
-                    window.show_quick_panel(
+                    items = [code_action["title"] for code_action in actions]
+                    self.view.show_popup_menu(
                         items,
-                        lambda i: self.handle_code_action_select(config_name, actions, i),
-                        selected_index=selected_index,
-                        placeholder="Code actions")
+                        lambda i: self.handle_code_action_select(config_name, actions, i))
             else:
                 self.handle_code_action_select(config_name, actions, 0)
         elif href == "quick-panel:DocumentLink":