diff --git a/lib/i18n_yaml_editor/app.rb b/lib/i18n_yaml_editor/app.rb
index d196ef2..5cdc3d3 100644
--- a/lib/i18n_yaml_editor/app.rb
+++ b/lib/i18n_yaml_editor/app.rb
@@ -25,6 +25,7 @@ def start
       store.create_missing_keys
 
       $stdout.puts " * Starting web editor at port 5050"
+      Rack::Utils.key_space_limit = 131072 # 2 times the default
       Rack::Server.start :app => Web, :Port => 5050
     end
 
@@ -39,7 +40,7 @@ def load_translations
     def save_translations
       files = store.to_yaml
       files.each {|file, yaml|
-        File.open(file, "w", encoding: "utf-8") {|f| f << yaml.to_yaml}
+        File.open(file, "w", encoding: "utf-8") {|f| f << yaml.to_yaml({:line_width => -1})}
       }
     end
   end