diff --git a/src/main/java/org/olat/core/commons/controllers/filechooser/LinkFileCombiCalloutController.java b/src/main/java/org/olat/core/commons/controllers/filechooser/LinkFileCombiCalloutController.java
index 8192823a87701adfbc8835e5cc66cd8d7f8d57a3..87e0fe2bfe2214bab6135d3b3a661c9da9970fce 100644
--- a/src/main/java/org/olat/core/commons/controllers/filechooser/LinkFileCombiCalloutController.java
+++ b/src/main/java/org/olat/core/commons/controllers/filechooser/LinkFileCombiCalloutController.java
@@ -482,19 +482,21 @@ public class LinkFileCombiCalloutController extends BasicController {
 	
 	public boolean isEditorEnabled() {
 		// enable html editor for html files
-		if(editable && StringHelper.containsNonWhitespace(relFilePath)) {
+		return editable && isHtmlFile();
+	}
+	
+	public boolean isHtmlFile() {
+		if(StringHelper.containsNonWhitespace(relFilePath)) {
 			String lowercase = relFilePath.toLowerCase().trim();
 			if (lowercase.endsWith(".html") || lowercase.endsWith(".htm")) {
 				return true;
 			}
 		}
-		// disable html editor for all other cases
 		return false;		
 	}
 
 	@Override
 	protected void doDispose() {
-		// controllers auto-disposed by basic controller
+		//
 	}
-
 }
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/nodes/sp/SPEditController.java b/src/main/java/org/olat/course/nodes/sp/SPEditController.java
index a1adc34d03b31cb43831ab1cb30911f51faa88fe..4c2b14ff718bf8b7a10c85349ea00526fdaaf7fb 100644
--- a/src/main/java/org/olat/course/nodes/sp/SPEditController.java
+++ b/src/main/java/org/olat/course/nodes/sp/SPEditController.java
@@ -191,8 +191,12 @@ public class SPEditController extends ActivateableTabbableDefaultController impl
 				combiLinkCtr.setEditable(hasEditRights(relPath));
 				moduleConfiguration.set(CONFIG_KEY_FILE, relPath);
 				fireEvent(urequest, NodeEditController.NODECONFIG_CHANGED_EVENT);
-				if(!myTabbedPane.containsTab(deliveryOptionsCtrl.getInitialComponent())) {
-					myTabbedPane.addTab(translate(PANE_TAB_DELIVERYOPTIONS), deliveryOptionsCtrl.getInitialComponent());
+				if(combiLinkCtr.isHtmlFile()) {
+					if(!myTabbedPane.containsTab(deliveryOptionsCtrl.getInitialComponent())) {
+						myTabbedPane.addTab(translate(PANE_TAB_DELIVERYOPTIONS), deliveryOptionsCtrl.getInitialComponent());
+					}
+				} else {
+					myTabbedPane.removeTab(deliveryOptionsCtrl.getInitialComponent());
 				}
 				myContent.contextPut("editorEnabled", combiLinkCtr.isEditorEnabled());
 			}
@@ -221,7 +225,7 @@ public class SPEditController extends ActivateableTabbableDefaultController impl
 		myTabbedPane = tabbedPane;
 		tabbedPane.addTab(translate(PANE_TAB_ACCESSIBILITY), accessibilityCondContr.getWrappedDefaultAccessConditionVC(translate(NLS_CONDITION_ACCESSIBILITY_TITLE)));
 		tabbedPane.addTab(translate(PANE_TAB_SPCONFIG), myContent);
-		if(combiLinkCtr != null && combiLinkCtr.isEditorEnabled()) {
+		if(combiLinkCtr != null && combiLinkCtr.isHtmlFile()) {
 			tabbedPane.addTab(translate(PANE_TAB_DELIVERYOPTIONS), deliveryOptionsCtrl.getInitialComponent());
 		}
 	}