diff --git a/modules/ui/popover.js b/modules/ui/popover.js
index 42ee586ee..a6174b687 100644
--- a/modules/ui/popover.js
+++ b/modules/ui/popover.js
@@ -171,8 +171,15 @@ export function uiPopover(klass) {
                 if (d3_event.buttons !== 0) return;
 
                 show.apply(this, arguments);
-            });
-            anchor.on(_pointerPrefix + 'leave.popover', function() {
+            })
+            .on(_pointerPrefix + 'leave.popover', function() {
+                hide.apply(this, arguments);
+            })
+            // show on focus too for better keyboard navigation support
+            .on('focus.popover', function() {
+                show.apply(this, arguments);
+            })
+            .on('blur.popover', function() {
                 hide.apply(this, arguments);
             });