diff --git a/src/ts/component/popup/confirm.tsx b/src/ts/component/popup/confirm.tsx
index 848529045e..9b152718c8 100644
--- a/src/ts/component/popup/confirm.tsx
+++ b/src/ts/component/popup/confirm.tsx
@@ -7,7 +7,7 @@ const PopupConfirm = observer(class PopupConfirm extends React.Component<I.Popup
 
 	refButtons: any = null;
 	refCheckbox: any = null;
-	n = 0;
+	n: number = null;
 
 	constructor (props: I.Popup) {
 		super(props);
@@ -16,6 +16,7 @@ const PopupConfirm = observer(class PopupConfirm extends React.Component<I.Popup
 		this.onConfirm = this.onConfirm.bind(this);
 		this.onCancel = this.onCancel.bind(this);
 		this.onMouseEnter = this.onMouseEnter.bind(this);
+		this.onMouseLeave = this.onMouseLeave.bind(this);
 		this.setHighlight = this.setHighlight.bind(this);
 	};
 
@@ -50,8 +51,8 @@ const PopupConfirm = observer(class PopupConfirm extends React.Component<I.Popup
 				) : ''}
 
 				<div ref={ref => this.refButtons = ref} className="buttons">
-					{canConfirm ? <Button text={textConfirm} color={colorConfirm} className="c36" onClick={this.onConfirm} onMouseEnter={this.onMouseEnter} /> : ''}
-					{canCancel ? <Button text={textCancel} color={colorCancel} className="c36" onClick={this.onCancel} onMouseEnter={this.onMouseEnter} /> : ''}
+					{canConfirm ? <Button text={textConfirm} color={colorConfirm} className="c36" onClick={this.onConfirm} onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave} /> : ''}
+					{canCancel ? <Button text={textCancel} color={colorCancel} className="c36" onClick={this.onCancel} onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave} /> : ''}
 				</div>
 
 				<Error text={error} />
@@ -104,6 +105,12 @@ const PopupConfirm = observer(class PopupConfirm extends React.Component<I.Popup
 				return;
 			};
 
+			if (this.n === null) {
+				this.n = 0;
+				this.setHighlight();
+				return;
+			}
+
 			this.n += dir;
 			if (this.n < 0) {
 				this.n = buttons.length - 1;
@@ -160,6 +167,12 @@ const PopupConfirm = observer(class PopupConfirm extends React.Component<I.Popup
 		this.setHighlight();
 	};
 
+	onMouseLeave (e: any) {
+		$(e.currentTarget).removeClass('hover');
+
+		this.n = null;
+	}
+
 	setHighlight () {
 		const buttons = $(this.refButtons).find('.button');