diff --git a/src/components/Question.jsx b/src/components/Question.jsx
index 4f121fcf..717e9690 100644
--- a/src/components/Question.jsx
+++ b/src/components/Question.jsx
@@ -121,11 +121,11 @@ export default class Question extends React.Component {
     }
   };
 
-  _onMouseEnterHandler = () => {
+  _onEnterHandler = () => {
     this.setState({ showIcon: true });
   };
 
-  _onMouseLeaveHandler = () => {
+  _onLeaveHandler = () => {
     this.setState({ showIcon: false });
   };
 
@@ -222,8 +222,10 @@ export default class Question extends React.Component {
                 as={Card.Header}
                 onClick={this._toggleCollapse}
                 className={this._getHeaderClassName()}
-                onMouseEnter={this._onMouseEnterHandler}
-                onMouseLeave={this._onMouseLeaveHandler}
+                onMouseEnter={this._onEnterHandler}
+                onMouseLeave={this._onLeaveHandler}
+                onFocus={this._onEnterHandler}
+                onBlur={this._onLeaveHandler}
               >
                 <h6 className="d-inline" id={question["@id"]}>
                   {collapsible &&
@@ -352,8 +354,10 @@ export default class Question extends React.Component {
           key={"row-item-" + i}
           className={cls}
           id={question["@id"]}
-          onMouseEnter={this._onMouseEnterHandler}
-          onMouseLeave={this._onMouseLeaveHandler}
+          onMouseEnter={this._onEnterHandler}
+          onMouseLeave={this._onLeaveHandler}
+          onFocus={this._onEnterHandler}
+          onBlur={this._onLeaveHandler}
         >
           <div className="answer-content" style={this._getAnswerWidthStyle()}>
             <Answer