diff --git a/app/assets/stylesheets/partials/_inline_editing.scss b/app/assets/stylesheets/partials/_inline_editing.scss
index 4c0c1ca9f..b6b32532c 100644
--- a/app/assets/stylesheets/partials/_inline_editing.scss
+++ b/app/assets/stylesheets/partials/_inline_editing.scss
@@ -3,6 +3,9 @@
 
 
 .inline-editing-container {
+  display: flex;
+  flex-grow: 1;
+  max-width: 500px;
   position: relative;
 
   .button-container {
diff --git a/app/views/shared/_inline_editing.html.erb b/app/views/shared/_inline_editing.html.erb
index 6d078fc03..45669fca3 100644
--- a/app/views/shared/_inline_editing.html.erb
+++ b/app/views/shared/_inline_editing.html.erb
@@ -1,6 +1,5 @@
 <div 
-  class="inline-editing-container <%= name %>-editable-field" 
-  style="width:<%= (defined? width) ? width.html_safe : '100%' %>"
+  class="inline-editing-container <%= name %>-editable-field"
   data-field-to-update="<%= field_to_udpate %>"
   data-params-group="<%= params_group %>"
   data-path-to-update="<%= path_to_update %>"