diff --git a/src/sao.less b/src/sao.less
index f55a4e126c..c4e1355fa0 100644
--- a/src/sao.less
+++ b/src/sao.less
@@ -104,6 +104,18 @@ body {
         text-align: right;
         white-space: nowrap;
     }
+    & .form-many2one {
+        & button {
+            float: right;
+        }
+        & div {
+            overflow: hidden;
+            & input {
+                width: 100%;
+                boxing-sizing: border-box;
+            }
+        }
+    }
     & .form-one2many-menu, .form-one2many-content,
     .form-many2many-menu, .form-many2many-content {
         border: 1px solid rgb(170, 170, 170);
diff --git a/src/view.js b/src/view.js
index 6a54b18efd..6a54387dfb 100644
--- a/src/view.js
+++ b/src/view.js
@@ -1659,7 +1659,7 @@
                 'type': 'input'
             });
             this.entry.on('keyup', this.key_press.bind(this));
-            this.el.append(this.entry);
+            this.el.append(jQuery('<div/>').append(this.entry));
             this.but_open = jQuery('<button/>').button({
                 'icons': {
                     'primary': 'ui-icon-search'
@@ -1667,7 +1667,7 @@
                 'text': false
             });
             this.but_open.click(this.edit.bind(this));
-            this.el.append(this.but_open);
+            this.el.prepend(this.but_open);
             this.but_new = jQuery('<button/>').button({
                 'icons': {
                     'primary': 'ui-icon-document'
@@ -1675,7 +1675,7 @@
                 'text': false
             });
             this.but_new.click(this.new_.bind(this));
-            this.el.append(this.but_new);
+            this.el.prepend(this.but_new);
             // TODO autocompletion
         },
         _get_color_el: function() {