diff --git a/question/classes/bank/search/category_condition.php b/question/classes/bank/search/category_condition.php
index f37a8ef176a..c2a40088854 100644
--- a/question/classes/bank/search/category_condition.php
+++ b/question/classes/bank/search/category_condition.php
@@ -118,7 +118,7 @@ class category_condition extends condition {
         echo \html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'recurse',
                                                'value' => 0, 'id' => 'recurse_off'));
         echo \html_writer::checkbox('recurse', '1', $this->recurse, get_string('includesubcategories', 'question'),
-                                       array('id' => 'recurse_on', 'class' => 'searchoptions'));
+                                       array('id' => 'recurse_on', 'class' => 'searchoptions mr-1'));
         echo \html_writer::end_div() . "\n";
     }
 
@@ -132,7 +132,7 @@ class category_condition extends condition {
     protected function display_category_form($contexts, $pageurl, $current) {
         echo \html_writer::start_div('choosecategory');
         $catmenu = question_category_options($contexts, true, 0, true);
-        echo \html_writer::label(get_string('selectacategory', 'question'), 'id_selectacategory');
+        echo \html_writer::label(get_string('selectacategory', 'question'), 'id_selectacategory', true, array("class" => "mr-1"));
         echo \html_writer::select($catmenu, 'category', $current, array(),
                 array('class' => 'searchoptions custom-select', 'id' => 'id_selectacategory'));
         echo \html_writer::end_div() . "\n";
@@ -170,7 +170,7 @@ class category_condition extends condition {
         $formatoptions = new \stdClass();
         $formatoptions->noclean = true;
         $formatoptions->overflowdiv = true;
-        echo \html_writer::start_div('boxaligncenter categoryinfo');
+        echo \html_writer::start_div('boxaligncenter categoryinfo pl-0');
         if (isset($this->maxinfolength)) {
             echo shorten_text(format_text($category->info, $category->infoformat, $formatoptions, $this->course->id),
                                      $this->maxinfolength);
diff --git a/question/classes/bank/search/hidden_condition.php b/question/classes/bank/search/hidden_condition.php
index 247d64d8b62..cf80f2eeb38 100644
--- a/question/classes/bank/search/hidden_condition.php
+++ b/question/classes/bank/search/hidden_condition.php
@@ -62,7 +62,7 @@ class hidden_condition extends condition {
         echo \html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'showhidden',
                                                    'value' => '0', 'id' => 'showhidden_off'));
         echo \html_writer::checkbox('showhidden', '1', (! $this->hide), get_string('showhidden', 'question'),
-                                   array('id' => 'showhidden_on', 'class' => 'searchoptions'));
+                                   array('id' => 'showhidden_on', 'class' => 'searchoptions mr-1'));
         echo \html_writer::end_div() . "\n";
     }
 }
diff --git a/question/classes/bank/view.php b/question/classes/bank/view.php
index 5197b872e34..10b69dd8f3e 100644
--- a/question/classes/bank/view.php
+++ b/question/classes/bank/view.php
@@ -652,8 +652,8 @@ class view {
         echo '<div>';
         echo \html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'qbshowtext',
                                                'value' => 0, 'id' => 'qbshowtext_off'));
-        echo \html_writer::checkbox('qbshowtext', '1', $showquestiontext, get_string('showquestiontext', 'question'),
-                                       array('id' => 'qbshowtext_on', 'class' => 'searchoptions'));
+        echo \html_writer::checkbox('qbshowtext', '1', $showquestiontext, ' ' . get_string('showquestiontext', 'question'),
+                                       array('id' => 'qbshowtext_on', 'class' => 'searchoptions mr-1'));
         echo "</div>\n";
     }
 
diff --git a/theme/boost/scss/moodle/question.scss b/theme/boost/scss/moodle/question.scss
index 889849d6529..6154e04def9 100644
--- a/theme/boost/scss/moodle/question.scss
+++ b/theme/boost/scss/moodle/question.scss
@@ -619,6 +619,10 @@ body.path-question-type {
     width: auto;
 }
 
+.questionbankwindow .form-autocomplete-selection {
+    margin-left: 0;
+}
+
 #page-mod-quiz-edit div.editq div.question div.content {
     background-color: $body-bg;
     border: 1px solid #ddd;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 7d8010862d0..8056feb7ffd 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -14275,6 +14275,9 @@ body.path-question-type {
 .questionbankwindow .module {
   width: auto; }
 
+.questionbankwindow .form-autocomplete-selection {
+  margin-left: 0; }
+
 #page-mod-quiz-edit div.editq div.question div.content {
   background-color: #fff;
   border: 1px solid #ddd;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 0cadb95d1b9..189991f107e 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -14530,6 +14530,9 @@ body.path-question-type {
 .questionbankwindow .module {
   width: auto; }
 
+.questionbankwindow .form-autocomplete-selection {
+  margin-left: 0; }
+
 #page-mod-quiz-edit div.editq div.question div.content {
   background-color: #fff;
   border: 1px solid #ddd;