diff --git a/mod/lesson/pagetypes/multichoice.php b/mod/lesson/pagetypes/multichoice.php
index aaf762d5bc8..46561450669 100644
--- a/mod/lesson/pagetypes/multichoice.php
+++ b/mod/lesson/pagetypes/multichoice.php
@@ -496,6 +496,7 @@ class lesson_display_answer_form_multichoice_singleanswer extends moodleform {
         $i = 0;
         foreach ($answers as $answer) {
             $mform->addElement('html', '<div class="answeroption">');
+            $answer->answer = preg_replace('#>$#', '> ', $answer->answer);
             $mform->addElement('radio','answerid',null,format_text($answer->answer, $answer->answerformat, $options),$answer->id, $disabled);
             $mform->setType('answer'.$i, PARAM_INT);
             if ($hasattempt && $answer->id == $USER->modattempts[$lessonid]->answerid) {
@@ -558,6 +559,7 @@ class lesson_display_answer_form_multichoice_multianswer extends moodleform {
                 $mform->setDefault('answer['.$answer->id.']', true);
             }
             // NOTE: our silly checkbox supports only value '1' - we can not use it like the radiobox above!!!!!!
+            $answer->answer = preg_replace('#>$#', '> ', $answer->answer);
             $mform->addElement('checkbox', $answerid, null, format_text($answer->answer, $answer->answerformat, $options), $disabled);
             $mform->setType($answerid, PARAM_INT);
 
diff --git a/mod/lesson/styles.css b/mod/lesson/styles.css
index fb26b3c8ab7..583b4f81c76 100644
--- a/mod/lesson/styles.css
+++ b/mod/lesson/styles.css
@@ -26,6 +26,48 @@
 
 .path-mod-lesson .resourcecontent {text-align: center;}
 
+.path-mod-lesson .answeroption .fcheckbox > span,
+.path-mod-lesson .answeroption .fradio > span {
+    position: relative;
+    float: left;
+}
+
+.path-mod-lesson .answeroption .fcheckbox input,
+.path-mod-lesson .answeroption .fradio input {
+    position: absolute;
+    top: 2px;
+    margin-top: 0px;
+    left: 0;
+}
+
+.path-mod-lesson .answeroption .fcheckbox label,
+.path-mod-lesson .answeroption .fradio label {
+    padding-left: 20px;
+    float: left;
+}
+
+.path-mod-lesson .answeroption .felement label p:last-child {
+    margin-bottom: 0px;
+}
+
+.path-mod-lesson.dir-rtl .answeroption .fcheckbox > span,
+.path-mod-lesson.dir-rtl .answeroption .fradio > span {
+    float: right;
+}
+
+.path-mod-lesson.dir-rtl .answeroption .fcheckbox input,
+.path-mod-lesson.dir-rtl .answeroption .fradio input {
+    left: inherit;
+    right: 0;
+}
+
+.path-mod-lesson.dir-rtl .answeroption .fcheckbox label,
+.path-mod-lesson.dir-rtl .answeroption .fradio label {
+    padding-left: 0;
+    padding-right: 20px;
+    float: right;
+}
+
 /**
  * Style for view.php
  **/