diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/ChoiceScoreController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/ChoiceScoreController.java
index 497339e1b8e5ff1112879c3e00b1ba544db4584e..232712ca5715fcb824921b74a6ec449935c84e90 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/ChoiceScoreController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/ChoiceScoreController.java
@@ -119,7 +119,9 @@ public class ChoiceScoreController extends AssessmentItemRefEditorController imp
 		String[] choiceKeys = new String[0];
 		String[] choiceValues = new String[0];
 		maxChoicesEl = uifactory.addDropdownSingleselect("max.choices", formLayout, choiceKeys, choiceValues, null);
+		maxChoicesEl.setEnabled(!restrictedEdit && !readOnly);
 		minChoicesEl = uifactory.addDropdownSingleselect("min.choices", formLayout, choiceKeys, choiceValues, null);
+		minChoicesEl.setEnabled(!restrictedEdit && !readOnly);
 		updateMinMaxChoices();
 		
 		String[] modeValues = new String[]{
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MultipleChoiceEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MultipleChoiceEditorController.java
index c340254efb0c2148f35320f5d94a43a6f376f467..1c7602ff635492ac57cad6f4ad02edc383418256 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MultipleChoiceEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MultipleChoiceEditorController.java
@@ -176,6 +176,7 @@ public class MultipleChoiceEditorController extends FormBasicController {
 		String choiceId = "answer" + count++;
 		RichTextElement choiceEl = uifactory.addRichTextElementForQTI21(choiceId, "form.imd.answer", choiceContent, 8, -1, itemContainer,
 				answersCont, ureq.getUserSession(), getWindowControl());
+		choiceEl.setEnabled(!readOnly);
 		choiceEl.getEditorConfiguration().setSimplestTextModeAllowed(TextMode.oneLine);
 		choiceEl.setUserObject(choice);
 		answersCont.add("choiceId", choiceEl);