diff --git a/src/main/java/org/olat/modules/portfolio/ui/PageRunController.java b/src/main/java/org/olat/modules/portfolio/ui/PageRunController.java
index a868c3b923b68c1b1468204d575ea8dccb0dfd1c..eccddec1103974d109719e152293ebae85497d85 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/PageRunController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/PageRunController.java
@@ -77,7 +77,7 @@ import org.olat.modules.ceditor.SimpleAddPageElementHandler;
 import org.olat.modules.ceditor.ui.AddElementInfos;
 import org.olat.modules.ceditor.ui.FullEditorSecurityCallback;
 import org.olat.modules.ceditor.ui.PageController;
-import org.olat.modules.ceditor.ui.PageEditorController;
+import org.olat.modules.ceditor.ui.PageEditorV2Controller;
 import org.olat.modules.ceditor.ui.ValidationMessage;
 import org.olat.modules.portfolio.Assignment;
 import org.olat.modules.portfolio.Binder;
@@ -134,7 +134,7 @@ public class PageRunController extends BasicController implements TooledControll
 	private CloseableModalController cmc;
 	private PageMetadataController pageMetaCtrl;
 	private PageController pageCtrl;
-	private PageEditorController pageEditCtrl;
+	private PageEditorV2Controller pageEditCtrl;
 	private RestorePageController restorePageCtrl;
 	private ConfirmClosePageController confirmDonePageCtrl;
 	private DialogBoxController confirmPublishCtrl, confirmRevisionCtrl, confirmCloseCtrl,
@@ -201,7 +201,7 @@ public class PageRunController extends BasicController implements TooledControll
 		putInitialPanel(mainVC);
 		
 		if(openInEditMode) {
-			pageEditCtrl = new PageEditorController(ureq, getWindowControl(),
+			pageEditCtrl = new PageEditorV2Controller(ureq, getWindowControl(),
 					new PortfolioPageEditorProvider(ureq.getUserSession().getRoles()), new FullEditorSecurityCallback(),
 					getTranslator());
 			listenTo(pageEditCtrl);
@@ -652,7 +652,7 @@ public class PageRunController extends BasicController implements TooledControll
 		} else {
 			lockEntry = coordinator.getCoordinator().getLocker().acquireLock(lockOres, getIdentity(), "");
 			if(lockEntry.isSuccess()) {
-				pageEditCtrl = new PageEditorController(ureq, getWindowControl(),
+				pageEditCtrl = new PageEditorV2Controller(ureq, getWindowControl(),
 						new PortfolioPageEditorProvider(ureq.getUserSession().getRoles()),
 						new FullEditorSecurityCallback(), getTranslator());
 				listenTo(pageEditCtrl);
diff --git a/src/main/webapp/static/js/jquery/openolat/jquery.contenteditor.v2.js b/src/main/webapp/static/js/jquery/openolat/jquery.contenteditor.v2.js
index 64c78e459cd0e93133302768110e5d79a792b88b..4cc03b75b1f2272780b684d11bd63d27898a11c0 100644
--- a/src/main/webapp/static/js/jquery/openolat/jquery.contenteditor.v2.js
+++ b/src/main/webapp/static/js/jquery/openolat/jquery.contenteditor.v2.js
@@ -81,6 +81,7 @@
 		
 		interact('.o_page_part.o_page_part_view, .o_page_fragment_edit').draggable({
 			autoScroll: true,
+			ignoreFrom: '.o_page_part.o_page_edit form',
 			allowFrom: '.o_page_tools_dd, .o_page_part.o_page_part_view',
 			modifiers: [
 				interact.modifiers.restrict({