diff --git a/wise-webapp/src/main/webapp/js/editor.js b/wise-webapp/src/main/webapp/js/editor.js
index 41f1061d..9d3b3226 100644
--- a/wise-webapp/src/main/webapp/js/editor.js
+++ b/wise-webapp/src/main/webapp/js/editor.js
@@ -589,15 +589,16 @@ function fontFamilyPanel()
 
 function shapeTypePanel()
 {
-    var shapeTypePanel = ['rectagle','rounded rectagle','line','elipse'];
+    var shapeTypePanel = ['rectagle','rounded_rectagle','line','elipse'];
     var updateFunction = function(value)
     {
-        designer.setShape2SelectedNode(value);
+        designer.setShape2SelectedNode(value.replace('_',' '));
     };
 
     var onFocusValue = function(selectedNode)
     {
-        return selectedNode.getShapeType();
+
+        return selectedNode.getShapeType().replace(' ','_');
     };
 
     buildPanel('topicShape', 'topicShapePanel', shapeTypePanel, updateFunction, onFocusValue);
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
index 0a4b41d9..a05f6de7 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@@ -103,7 +103,7 @@
 <div id="topicShapePanel" class="toolbarPanel">
     <!--<div id="automatic" class="toolbarPanelLink">Automatic</div>-->
     <div id="rectagle" class="toolbarPanelLink"><img src="../images/shape-rectangle.png" alt="Rectangle" width="40" height="25"></div>
-    <div id="rounded rectagle" class="toolbarPanelLink"><img src="../images/shape-rectangle-rounded.png" alt="Rounded Rectangle" width="40" height="25"></div>
+    <div id="rounded_rectagle" class="toolbarPanelLink"><img src="../images/shape-rectangle-rounded.png" alt="Rounded Rectangle" width="40" height="25"></div>
     <div id="line" class="toolbarPanelLink"><img src="../images/shape-line.png" alt="Line" width="40" height="7"></div>
     <div id="elipse" class="toolbarPanelLink"><img src="../images/shape-elipse.png" alt="Elipse" width="40" height="25"></div>
 </div>
diff --git a/wise-webapp/src/test/data/svg/map4.png b/wise-webapp/src/test/data/svg/map4.png
new file mode 100644
index 00000000..e69de29b