diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 5a9f896..74821bf 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -1406,7 +1406,8 @@ private:
                     || (linebreakHints.length == 0 && currentLineLength + nextTokenLength() > config.max_line_length))
             {
                 pushWrapIndent();
-                newline();
+                if (!peekBackIs(tok!"comment"))
+                    newline();
                 if (ufcsWrap || onNextLine)
                     regenLineBreakHints(index);
             }
@@ -1468,7 +1469,8 @@ private:
                 {
                     if (!indents.topIs(tok!"enum"))
                         pushWrapIndent();
-                    newline();
+                    if (!peekBackIs(tok!"comment"))
+                        newline();
                 }
                 else
                 {
@@ -1483,7 +1485,8 @@ private:
 
                 if (rightOperandLine > operatorLine)
                 {
-                    newline();
+                    if (!peekBackIs(tok!"comment"))
+                        newline();
                 }
                 else
                 {
diff --git a/tests/allman/issue0509.d.ref b/tests/allman/issue0509.d.ref
new file mode 100644
index 0000000..52b1c7c
--- /dev/null
+++ b/tests/allman/issue0509.d.ref
@@ -0,0 +1,34 @@
+void main()
+{
+    string a = "foo"
+        ~ "bar" // bar
+        ~ "baz";
+}
+
+void foo()
+{
+    afdsafds
+        .asdf // blah
+        .flub;
+}
+
+void main()
+{
+    string a = "foo"
+        ~ "bar" /* bar */
+        ~ "baz";
+}
+
+void foo()
+{
+    afdsafds
+        .asdf /* blah */
+        .flub;
+}
+
+void foo() // hello
+{ // world
+    // ok
+    writeln("hi"); // hi!
+} // done
+//finish
diff --git a/tests/issue0509.args b/tests/issue0509.args
new file mode 100644
index 0000000..7e7e52d
--- /dev/null
+++ b/tests/issue0509.args
@@ -0,0 +1 @@
+--keep_line_breaks=true
diff --git a/tests/issue0509.d b/tests/issue0509.d
new file mode 100644
index 0000000..52b1c7c
--- /dev/null
+++ b/tests/issue0509.d
@@ -0,0 +1,34 @@
+void main()
+{
+    string a = "foo"
+        ~ "bar" // bar
+        ~ "baz";
+}
+
+void foo()
+{
+    afdsafds
+        .asdf // blah
+        .flub;
+}
+
+void main()
+{
+    string a = "foo"
+        ~ "bar" /* bar */
+        ~ "baz";
+}
+
+void foo()
+{
+    afdsafds
+        .asdf /* blah */
+        .flub;
+}
+
+void foo() // hello
+{ // world
+    // ok
+    writeln("hi"); // hi!
+} // done
+//finish
diff --git a/tests/otbs/issue0509.d.ref b/tests/otbs/issue0509.d.ref
new file mode 100644
index 0000000..62b06c2
--- /dev/null
+++ b/tests/otbs/issue0509.d.ref
@@ -0,0 +1,30 @@
+void main() {
+    string a = "foo"
+        ~ "bar" // bar
+        ~ "baz";
+}
+
+void foo() {
+    afdsafds
+        .asdf // blah
+        .flub;
+}
+
+void main() {
+    string a = "foo"
+        ~ "bar" /* bar */
+        ~ "baz";
+}
+
+void foo() {
+    afdsafds
+        .asdf /* blah */
+        .flub;
+}
+
+void foo() // hello
+{ // world
+    // ok
+    writeln("hi"); // hi!
+} // done
+//finish