diff --git a/resources/styles/common/framework.scss b/resources/styles/common/framework.scss
index 3d7fdb33f..ac03c6c4f 100644
--- a/resources/styles/common/framework.scss
+++ b/resources/styles/common/framework.scss
@@ -437,6 +437,17 @@ input[type="checkbox"]:focus {
 
 }
 
+// Element-name
+
+input.element-name {
+  border: 1px solid $soft-ui-border;
+  border-radius: $br-small;
+  font-size: $fs13;
+  margin: 0px;
+  padding: 3px;
+  width: 100%;
+}
+
 // Input select
 
 .input-select {
diff --git a/resources/styles/main/partials/sidebar-layers.scss b/resources/styles/main/partials/sidebar-layers.scss
index 1eeb84667..bb1f85110 100644
--- a/resources/styles/main/partials/sidebar-layers.scss
+++ b/resources/styles/main/partials/sidebar-layers.scss
@@ -190,14 +190,6 @@
         white-space: nowrap;
       }
 
-      input.element-name {
-        margin: 0px;
-        border: 1px solid #eee;
-        padding: 3px;
-        font-size: $fs13;
-        width: 120px;
-      }
-
       &.selected {
 
         .element-icon {
diff --git a/src/uxbox/main/ui/dashboard/icons.cljs b/src/uxbox/main/ui/dashboard/icons.cljs
index 83164e155..2b63fcac3 100644
--- a/src/uxbox/main/ui/dashboard/icons.cljs
+++ b/src/uxbox/main/ui/dashboard/icons.cljs
@@ -330,7 +330,7 @@
       (icon/icon-svg icon)]
      [:div.item-info
       (if edition?
-        [:input {:type "text"
+        [:input.element-name {:type "text"
                  :auto-focus true
                  :on-key-down on-key-down
                  :on-blur on-blur
diff --git a/src/uxbox/main/ui/dashboard/images.cljs b/src/uxbox/main/ui/dashboard/images.cljs
index 245959207..d28d6d5af 100644
--- a/src/uxbox/main/ui/dashboard/images.cljs
+++ b/src/uxbox/main/ui/dashboard/images.cljs
@@ -332,7 +332,7 @@
        [:label {:for (:id image)}]]]
      [:div.item-info
       (if edition?
-        [:input {:type "text"
+        [:input.element-name {:type "text"
                  :auto-focus true
                  :on-key-down on-key-down
                  :on-blur on-blur