diff --git a/src/items.rs b/src/items.rs
index b41b6166eca..118e8f96b96 100644
--- a/src/items.rs
+++ b/src/items.rs
@@ -1617,7 +1617,8 @@ fn rewrite_fn_base(context: &RewriteContext,
                                         fd.variadic,
                                         generics_str.contains('\n')));
 
-    let multi_line_arg_str = arg_str.contains('\n');
+    let multi_line_arg_str = arg_str.contains('\n') ||
+                             arg_str.chars().last().map_or(false, |c| c == ',');
 
     let put_args_in_block = match context.config.fn_args_layout {
         IndentStyle::Block => multi_line_arg_str || generics_str.contains('\n'),
@@ -1849,12 +1850,16 @@ fn rewrite_args(context: &RewriteContext,
         arg_items.extend(more_items);
     }
 
+    let fits_in_one_line = !generics_str_contains_newline &&
+                           (arg_items.len() == 0 ||
+                            arg_items.len() == 1 && arg_item_strs[0].len() <= one_line_budget);
+
     for (item, arg) in arg_items.iter_mut().zip(arg_item_strs) {
         item.item = Some(arg);
     }
 
     let (indent, trailing_comma, end_with_newline) = match context.config.fn_args_layout {
-        IndentStyle::Block if !generics_str_contains_newline && arg_items.len() <= 1 => {
+        IndentStyle::Block if fits_in_one_line => {
             (indent.block_indent(context.config), SeparatorTactic::Never, true)
         }
         IndentStyle::Block => {
diff --git a/tests/source/configs-fn_args_layout-block.rs b/tests/source/configs-fn_args_layout-block.rs
index bb36e9d34c5..eb09b941c33 100644
--- a/tests/source/configs-fn_args_layout-block.rs
+++ b/tests/source/configs-fn_args_layout-block.rs
@@ -8,3 +8,9 @@ fn lorem(ipsum: usize) {}
 fn lorem(ipsum: usize, dolor: usize, sit: usize, amet: usize, consectetur: usize, adipiscing: usize, elit: usize) {
     // body
 }
+
+// #1441
+extern "system" {
+    pub fn GetConsoleHistoryInfo(console_history_info: *mut ConsoleHistoryInfo) -> Boooooooooooooool;
+}
+
diff --git a/tests/target/configs-fn_args_layout-block.rs b/tests/target/configs-fn_args_layout-block.rs
index 2eab7d953a5..586d118b210 100644
--- a/tests/target/configs-fn_args_layout-block.rs
+++ b/tests/target/configs-fn_args_layout-block.rs
@@ -16,3 +16,10 @@ fn lorem(
 ) {
     // body
 }
+
+// #1441
+extern "system" {
+    pub fn GetConsoleHistoryInfo(
+        console_history_info: *mut ConsoleHistoryInfo,
+    ) -> Boooooooooooooool;
+}