diff --git a/lib/widgets/vedor/editor.v9.php b/lib/widgets/vedor/editor.v9.php
index 45ac47c64..5c423c6dd 100755
--- a/lib/widgets/vedor/editor.v9.php
+++ b/lib/widgets/vedor/editor.v9.php
@@ -511,7 +511,7 @@ function init() {
 			updateHtmlContext();
 
 			addBordersStyleSheet(vdEditDoc);
-			VD_DETAILS_onclick(getOption('borders'));
+			VD_DETAILS_onclick(getOption('borders')!==false);
 			if ( vdEditDoc ) {
 				vdEditDoc.documentElement.classList.add('vedor-editor');
 				vdEditDoc.body.classList.add('vedor-editor');
@@ -2848,7 +2848,9 @@ function getToolbarPosition(sel) {
 
 	function repositionToolbar() {
 		var sel = vdSelectionState.get();
-		var currentContext = getVedorEditorContext();
+		if ( !currentContext ) {
+			currentContext = getVedorEditorContext();
+		}
 		var activeSection = document.getElementById(currentContext);
 		var pos = getToolbarPosition(sel);
 		if ( !pos || !activeSection ) {
@@ -2926,8 +2928,9 @@ function hideToolbar(clearFooter) {
 		}
 	}
 
+	var currentContext = '';
 	function showVedorEditorContext() {
-		var currentContext = getVedorEditorContext();
+		currentContext = getVedorEditorContext();
 
 		var sections = document.querySelectorAll("section.vedor-section");
 		for (var i=0; i<sections.length; i++) {