diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index 6f09a599..a7456018 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -666,6 +666,7 @@ function svg_edit_setup() {
 	var updateToolbar = function() {
 		if (selectedElement != null && 
 			selectedElement.tagName != "image" &&
+			selectedElement.tagName != "text" &&
 			selectedElement.tagName != "foreignObject" &&
 			selectedElement.tagName != "g")
 		{
@@ -1822,7 +1823,7 @@ function svg_edit_setup() {
 
 	var cancelOverlays = function() {
 		$('#dialog_box').hide();
-		if (!editingsource && !docprops) return;
+		if (!editingsource && !editingforeign && !docprops) return;
 
 		if (editingsource) {
 			var oldString = svgCanvas.getSvgString();
diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index a98cdc34..3da122a6 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -3654,7 +3654,7 @@ function BatchCommand(text) {
 				cleanupElement(element);
 				if(current_mode == "path") {
 					pathActions.toEditMode(element);
-				} else if (current_mode == "text" || current_mode == "image") {
+				} else if (current_mode == "text" || current_mode == "image" || current_mode == "foreignObject") {
 					// keep us in the tool we were in unless it was a text or image element
 					canvas.addToSelection([element], true);
 				}