diff --git a/dev/Styles/Ask.less b/dev/Styles/Ask.less
index 7f7d569bc..9373fa801 100644
--- a/dev/Styles/Ask.less
+++ b/dev/Styles/Ask.less
@@ -5,4 +5,9 @@
 		padding: 3em 15px;
 		text-align: center;
 	}
+
+	button:focus {
+		box-shadow: 0 0 1px inset;
+	}
+
 }
diff --git a/dev/View/Popup/Ask.js b/dev/View/Popup/Ask.js
index cb848e3f5..ba1c0d8c5 100644
--- a/dev/View/Popup/Ask.js
+++ b/dev/View/Popup/Ask.js
@@ -69,12 +69,15 @@ export class AskPopupView extends AbstractViewPopup {
 	onBuild() {
 //		shortcuts.add('tab', 'shift', 'Ask', () => {
 		shortcuts.add('tab,arrowright,arrowleft', '', 'Ask', () => {
-			let btn = this.querySelector('.buttonYes');
-			if (btn.matches(':focus')) {
-				btn = this.querySelector('.buttonNo');
+			let yes = this.querySelector('.buttonYes'),
+				no = this.querySelector('.buttonNo');
+			if (yes.matches(':focus')) {
+				no.focus();
+				return false;
+			} else if (no.matches(':focus')) {
+				yes.focus();
+				return false;
 			}
-			btn.focus();
-			return false;
 		});
 	}
 }