diff --git a/src/main/java/org/olat/ims/qti/editor/ItemMetadataFormController.java b/src/main/java/org/olat/ims/qti/editor/ItemMetadataFormController.java
index 81fd1acaa6149989c320cf1368b11d8dfa0d9708..827cd5129687b6813dcdc271a6aacf29b57ddb3c 100644
--- a/src/main/java/org/olat/ims/qti/editor/ItemMetadataFormController.java
+++ b/src/main/java/org/olat/ims/qti/editor/ItemMetadataFormController.java
@@ -252,6 +252,7 @@ public class ItemMetadataFormController extends FormBasicController {
 			// Shuffle Answers
 			shuffle = uifactory.addRadiosHorizontal("shuffle", "form.imd.shuffle", formLayout, yesnoKeys, yesnoValues);
 			shuffle.setEnabled(!isRestrictedEditMode);
+			shuffle.setVisible(t != Question.TYPE_ESSAY && t != Question.TYPE_FIB);
 			if (item.getQuestion().isShuffle()) {
 				shuffle.select("y", true);
 			} else {
@@ -263,6 +264,7 @@ public class ItemMetadataFormController extends FormBasicController {
 			showHints = uifactory.addRadiosHorizontal("showHints", "form.imd.solutionhints.show", formLayout, yesnoKeys, yesnoValues);
 			showHints.setEnabled(!isRestrictedEditMode);
 			showHints.addActionListener(FormEvent.ONCLICK); // Radios/Checkboxes need onclick because of IE bug OLAT-5753
+			showHints.setVisible(t != Question.TYPE_ESSAY);
 			
 			hint = uifactory.addRichTextElementForStringData("hint", "form.imd.solutionhints", item.getQuestion().getHintText(), 8, -1, 
 					true, qti.getBaseDir(), null, formLayout, ureq.getUserSession(), getWindowControl());