diff --git a/css/common.css b/css/common.css
index 73f0ba971..cbaf3ec54 100644
--- a/css/common.css
+++ b/css/common.css
@@ -636,4 +636,7 @@ body .ui-tooltip.ui-widget-content {
     padding: 1rem;
     border-radius: 0.25rem;
     margin-bottom: 1rem;
+}
+.qsm-question-wrapper.qsm-active-question{
+	zoom: 105%;
 }
\ No newline at end of file
diff --git a/js/qsm-quiz.js b/js/qsm-quiz.js
index e6397f34c..b39a7419f 100644
--- a/js/qsm-quiz.js
+++ b/js/qsm-quiz.js
@@ -1895,15 +1895,76 @@ jQuery(document).on( 'click', '.qsm-quiz-container', function() {
     jQuery('.qsm-quiz-container').removeClass('qsm-recently-active');
     jQuery(this).addClass('qsm-recently-active');
 });
-jQuery(document).keydown(function(e) {
-	if (e.keyCode === 39) {
-        jQuery('.qsm-quiz-container.qsm-recently-active').find('.mlw_next:visible').click();
-	}
-	if (e.keyCode === 37) {
-        jQuery('.qsm-quiz-container.qsm-recently-active').find('.mlw_previous:visible').click();
-	}
-	if (e.keyCode === 13) {
-        jQuery('.qsm-quiz-container.qsm-recently-active').find('.qsm-submit-btn:visible').click();
+jQuery(document).keydown(function(event) {
+	if (jQuery('.qsm-quiz-container.qsm-recently-active').length) {
+		jQuery(document).trigger('qsm_keyboard_quiz_action_start', event);
+
+        if ([39, 37, 13, 9].includes(event.keyCode)) {
+            event.preventDefault();
+        }
+        if (event.keyCode === 39) {
+            jQuery('.qsm-quiz-container.qsm-recently-active').find('.mlw_next:visible').click();
+        }
+        if (event.keyCode === 37) {
+            jQuery('.qsm-quiz-container.qsm-recently-active').find('.mlw_previous:visible').click();
+        }
+        if (event.keyCode === 13 && jQuery('textarea:focus').length === 0) {
+            jQuery('.qsm-quiz-container.qsm-recently-active').find('.qsm-submit-btn:visible').click();
+            jQuery('.qsm-quiz-container.qsm-recently-active').find('.mlw_next:visible').click();
+        }
+        if (event.keyCode === 40 && jQuery('.qsm-quiz-container.qsm-recently-active .qsm-question-wrapper.qsm-active-question .qmn_radio_answers:not(.qsm_multiple_grid_answers)').length) {
+            event.preventDefault();
+            let checkedInputs = jQuery('.qsm-quiz-container.qsm-recently-active .qsm-question-wrapper.qsm-active-question .qmn_radio_answers .qmn_mc_answer_wrap input:checked, .qsm-quiz-container.qsm-recently-active .qsm-question-wrapper.qsm-active-question .qmn_radio_answers .mlw_horizontal_choice input:checked');
+            if (checkedInputs.length === 0) {
+                jQuery('.qsm-quiz-container.qsm-recently-active .qsm-question-wrapper.qsm-active-question .qmn_radio_answers').find('input:first').click();
+            } else {
+                let nextInput = checkedInputs.closest('.qmn_mc_answer_wrap, .mlw_horizontal_choice').next('.qmn_mc_answer_wrap, .mlw_horizontal_choice').find('input[type="radio"]');
+                if (nextInput.length) {
+                    nextInput.click();
+                } else {
+                    jQuery('.qsm-quiz-container.qsm-recently-active .qsm-question-wrapper.qsm-active-question .qmn_radio_answers').find('input:first').click();
+                }
+            }
+        }
+        if (event.keyCode === 38 && jQuery('.qsm-quiz-container.qsm-recently-active .qsm-question-wrapper.qsm-active-question .qmn_radio_answers:not(.qsm_multiple_grid_answers)').length) {
+            event.preventDefault();
+            let checkedInputs = jQuery('.qsm-quiz-container.qsm-recently-active .qsm-question-wrapper.qsm-active-question .qmn_radio_answers .qmn_mc_answer_wrap input:checked, .qsm-quiz-container.qsm-recently-active .qsm-question-wrapper.qsm-active-question .qmn_radio_answers .mlw_horizontal_choice input:checked');
+            if (checkedInputs.length === 0) {
+                jQuery('.qsm-quiz-container.qsm-recently-active .qsm-question-wrapper.qsm-active-question .qmn_radio_answers').find('.qmn_mc_answer_wrap input:last, .mlw_horizontal_choice input:last').click();
+            } else {
+                let prevInput = checkedInputs.closest('.qmn_mc_answer_wrap, .mlw_horizontal_choice').prev('.qmn_mc_answer_wrap, .mlw_horizontal_choice').find('input[type="radio"]');
+                if (prevInput.length) {
+                    prevInput.click();
+                } else {
+                    jQuery('.qsm-quiz-container.qsm-recently-active .qsm-question-wrapper.qsm-active-question .qmn_radio_answers').find('.qmn_mc_answer_wrap input:last, .mlw_horizontal_choice input:last').click();
+                }
+            }
+        }
+        if (event.shiftKey && event.keyCode === 9) {
+            let active_question = jQuery('.qsm-quiz-container.qsm-recently-active .qsm-question-wrapper.qsm-active-question');
+            if (active_question.length) {
+                jQuery('.qsm-quiz-container.qsm-recently-active .qsm-question-wrapper').removeClass("qsm-active-question");
+                active_question.prev('.qsm-question-wrapper:visible').addClass("qsm-active-question");
+            } else {
+                jQuery(".qsm-quiz-container.qsm-recently-active .qsm-question-wrapper:visible:first-child").addClass("qsm-active-question");
+            }
+        } else if (event.keyCode === 9) {
+            let active_question = jQuery('.qsm-quiz-container.qsm-recently-active .qsm-question-wrapper.qsm-active-question');
+            if (active_question.length) {
+                jQuery('.qsm-quiz-container.qsm-recently-active .qsm-question-wrapper').removeClass("qsm-active-question");
+                active_question.next('.qsm-question-wrapper:visible').addClass("qsm-active-question");
+            } else {
+                jQuery(".qsm-quiz-container.qsm-recently-active .qsm-question-wrapper:visible:first-child").addClass("qsm-active-question");
+            }
+        }
+        if (event.keyCode === 9) {
+            let active_question = jQuery('.qsm-quiz-container.qsm-recently-active .qsm-question-wrapper.qsm-active-question');
+            if (active_question.length) {
+                jQuery('.qsm-quiz-container.qsm-recently-active .qsm-question-wrapper.qsm-active-question input:first').focus();
+            }
+        }
+		jQuery(document).trigger('qsm_keyboard_quiz_action_end', event);
     }
 });
 
+
diff --git a/php/admin/settings-page.php b/php/admin/settings-page.php
index f526267db..db20ecf4d 100644
--- a/php/admin/settings-page.php
+++ b/php/admin/settings-page.php
@@ -836,7 +836,7 @@ public function qsm_global_limit_number_of_questions() {
 			<input class="small-text" type="number" step="1" min="0" id="qsm-question-from-total-input" name="qsm-quiz-settings[question_from_total]" value="<?php echo esc_attr( $qsm_question_from_total ); ?>">
 			<?php esc_html_e( 'Maximum question limit', 'quiz-master-next'); ?>
 		</fieldset>
-		<fieldset class="buttonset buttonset-hide" data-hide="1" id="qsm-question-per-category" style="">
+		<fieldset class="buttonset buttonset-hide" data-hide="1" id="qsm-question-per-category">
 			<input class="small-text" type="number" step="1" min="0" id="qsm-question-per-category-input" name="qsm-quiz-settings[question_per_category]" value="<?php echo esc_attr( $qsm_question_per_category ); ?>">
 				<span class="qsm-opt-tr">
 					<?php esc_html_e( 'Limit number of questions per category', 'quiz-master-next'); ?>
@@ -873,10 +873,10 @@ public function default_answers(){
 	 */
 	public function qsm_global_enable_comments() {
 		global $globalQuizsetting;
-		$qsm_comment_section = ( isset( $globalQuizsetting['comment_section'] ) && '' !== $globalQuizsetting['comment_section'] ? $globalQuizsetting['comment_section'] : '0' );
+		$qsm_comment_section = ( isset( $globalQuizsetting['comment_section'] ) && '' !== $globalQuizsetting['comment_section'] ? $globalQuizsetting['comment_section'] : 0 );
 		?>
-		<label for="comment_section-0">
-			<input type="checkbox" id="comment_section-0" name="qsm-quiz-settings[comment_section]" value="0" <?php checked( $qsm_comment_section, 0 ); ?> >
+		<label class="qsm-opt-tr" for="qsm-comment-section">
+			<input type="checkbox" id="qsm-comment-section" name="qsm-quiz-settings[comment_section]" value="0" <?php checked( $qsm_comment_section, 0 ); ?> >
 			<?php esc_html_e( 'Allow users to post comments after completion', 'quiz-master-next' ); ?>
 		</label>
 		<?php
diff --git a/php/classes/class-qsm-install.php b/php/classes/class-qsm-install.php
index 41a747b61..f61963490 100644
--- a/php/classes/class-qsm-install.php
+++ b/php/classes/class-qsm-install.php
@@ -326,7 +326,6 @@ public function register_default_settings() {
 			'option_tab' => 'general',
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
 		/* ===== Generat tab end ======== */
 		/* ===== Submission tab start ======== */
 		$field_array = array(