diff --git a/frontend/apps/filemanager/filemanagersetdefaults.lua b/frontend/apps/filemanager/filemanagersetdefaults.lua
index c5d881702..1f14c4182 100644
--- a/frontend/apps/filemanager/filemanagersetdefaults.lua
+++ b/frontend/apps/filemanager/filemanagersetdefaults.lua
@@ -173,6 +173,8 @@ function SetDefaults:init()
                     table.insert(fields, {
                         text = tostring(k) .. " = " .. tostring(v),
                         hint = "",
+                        padding = Screen:scaleBySize(2),
+                        margin = Screen:scaleBySize(2),
                     })
                 end
                 self.set_dialog = MultiInputDialog:new{
diff --git a/frontend/ui/widget/multiinputdialog.lua b/frontend/ui/widget/multiinputdialog.lua
index 5433d2df7..8bd0e310c 100644
--- a/frontend/ui/widget/multiinputdialog.lua
+++ b/frontend/ui/widget/multiinputdialog.lua
@@ -47,6 +47,8 @@ function MultiInputDialog:init()
             focused = k == 1 and true or false,
             scroll = false,
             parent = self,
+            padding = field.padding or nil,
+            margin = field.margin or nil,
         }
         if Device:hasKeys() then
             --little hack to piggyback on the layout of the button_table to handle the new InputText
@@ -134,6 +136,9 @@ function MultiInputDialog:onSwitchFocus(inputbox)
     -- unfocus current inputbox
     self._input_widget:unfocus()
     self._input_widget:onCloseKeyboard()
+    UIManager:setDirty(nil, function()
+        return "ui", self.dialog_frame.dimen
+    end)
 
     -- focus new inputbox
     self._input_widget = inputbox