diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index c8edbdb369..82387cafa5 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -671,7 +671,6 @@
 
                                 } else {
                                     for (var i = 0; i < elShapeSections.length; i++) {
-                                        console.log("Hiding shape section " + elShapeSections[i])
                                         elShapeSections[i].style.display = 'none';
                                     }
                                 }
@@ -805,8 +804,10 @@
                                 }
                                 
                                 var activeElement = document.activeElement;
-        
-                                activeElement.select();
+                                
+                                if(typeof activeElement.select!=="undefined"){
+                                    activeElement.select();
+                                }
                             }
                         }
                     });