diff --git a/src/printer.js b/src/printer.js
index 9337a572..21f9ec22 100644
--- a/src/printer.js
+++ b/src/printer.js
@@ -74,7 +74,6 @@ function genericPrint(path, options, printPath, args) {
     return options.originalText.slice(util.locStart(node), util.locEnd(node));
   }
 
-  const parts = [];
   let needsParens = false;
   const linesWithoutParens = getPrintFunction(options)(
     path,
@@ -87,6 +86,7 @@ function genericPrint(path, options, printPath, args) {
     return linesWithoutParens;
   }
 
+  const decorators = [];
   if (
     node.decorators &&
     node.decorators.length > 0 &&
@@ -103,7 +103,6 @@ function genericPrint(path, options, printPath, args) {
         prefix = "";
       }
 
-      // #1817
       if (
         node.decorators.length === 1 &&
         node.type !== "ClassDeclaration" &&
@@ -118,10 +117,10 @@ function genericPrint(path, options, printPath, args) {
                   decorator.arguments[0].type === "Identifier" ||
                   decorator.arguments[0].type === "MemberExpression")))))
       ) {
-        separator = " ";
+        separator = line;
       }
 
-      parts.push(prefix, printPath(decoratorPath), separator);
+      decorators.push(prefix, printPath(decoratorPath), separator);
     }, "decorators");
   } else if (
     util.isExportDeclaration(node) &&
@@ -137,7 +136,7 @@ function genericPrint(path, options, printPath, args) {
           decorator.type === "TSDecorator"
           ? ""
           : "@";
-        parts.push(prefix, printPath(decoratorPath), line);
+        decorators.push(prefix, printPath(decoratorPath), hardline);
       },
       "declaration",
       "decorators"
@@ -156,6 +155,7 @@ function genericPrint(path, options, printPath, args) {
     node.needsParens = needsParens;
   }
 
+  const parts = [];
   if (needsParens) {
     parts.unshift("(");
   }
@@ -166,6 +166,9 @@ function genericPrint(path, options, printPath, args) {
     parts.push(")");
   }
 
+  if (decorators.length > 0) {
+    return group(concat(decorators.concat(parts)));
+  }
   return concat(parts);
 }
 
diff --git a/tests/typescript_decorators/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_decorators/__snapshots__/jsfmt.spec.js.snap
index 1b1aee03..d0cd905d 100644
--- a/tests/typescript_decorators/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_decorators/__snapshots__/jsfmt.spec.js.snap
@@ -81,6 +81,10 @@ class Class3 {
 class Bar {
     @decorated method() {}
 }
+
+class MyContainerComponent {
+  @ContentChildren(MyComponent) components: QueryListSomeBigName<MyComponentThat>;
+}
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 @d1
 @d2(foo)
@@ -130,4 +134,9 @@ class Bar {
   method() {}
 }
 
+class MyContainerComponent {
+  @ContentChildren(MyComponent)
+  components: QueryListSomeBigName<MyComponentThat>;
+}
+
 `;
diff --git a/tests/typescript_decorators/inline-decorators.ts b/tests/typescript_decorators/inline-decorators.ts
index ab3cf408..f5ce6c8d 100644
--- a/tests/typescript_decorators/inline-decorators.ts
+++ b/tests/typescript_decorators/inline-decorators.ts
@@ -43,3 +43,7 @@ class Class3 {
 class Bar {
     @decorated method() {}
 }
+
+class MyContainerComponent {
+  @ContentChildren(MyComponent) components: QueryListSomeBigName<MyComponentThat>;
+}