diff --git a/question/editlib.php b/question/editlib.php
index 1982df8765e..aae05293947 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -1860,8 +1860,9 @@ function print_choose_qtype_to_add_form($hiddenparams) {
 function print_qtype_to_add_option($qtype, $localizedname) {
     global $QTYPES;
     echo '<div class="qtypeoption">' . "\n";
+    echo '<label for="qtype_' . $qtype . '">';
     echo '<input type="radio" name="qtype" id="qtype_' . $qtype . '" value="' . $qtype . '" />';
-    echo '<label for="qtype_' . $qtype . '"><span class="qtypename">';
+    echo '<span class="qtypename">';
     $fakequestion = new stdClass;
     $fakequestion->qtype = $qtype;
     print_question_icon($fakequestion);
diff --git a/theme/standard/styles_fonts.css b/theme/standard/styles_fonts.css
index afbf97f894d..f70eb1fcc79 100644
--- a/theme/standard/styles_fonts.css
+++ b/theme/standard/styles_fonts.css
@@ -725,10 +725,6 @@ body#grade-index .grades .header {
  *** Question
  ***/
 
-#chooseqtype .instruction,
-#chooseqtype .qtypesummary {
-  font-size: 0.8em;
-}
 #chooseqtype .qtypename {
   font-weight: bold;
 }
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index a5b0efa3d51..34d4d385195 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -2919,6 +2919,9 @@ body.notes .notesgroup {
 #chooseqtype .qtypeoption {
   margin-bottom: 0.5em;
 }
+#chooseqtype label {
+  display: block;
+}
 #chooseqtype .qtypename img {
   padding: 0 0.3em;
 }
@@ -2951,6 +2954,9 @@ body.jsenabled #qtypechoicecontainer {
 #qtypechoicecontainer #chooseqtype .qtypeoption {
   margin-bottom: 0;
 }
+#qtypechoicecontainer #chooseqtype .qtypeoption input {
+  display: none;
+}
 #qtypechoicecontainer #chooseqtype .instruction,
 #qtypechoicecontainer #chooseqtype .qtypesummary {
   display: none;