diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 3c337ec..6fb75a6 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -941,7 +941,10 @@
   }
 
   bool canBreakBefore(unsigned i) {
+    if (Annotations[i - 1].ClosesTemplateDeclaration)
+      return true;
     if (Annotations[i - 1].Type == TokenAnnotation::TT_PointerOrReference ||
+        Annotations[i - 1].Type == TokenAnnotation::TT_TemplateCloser ||
         Annotations[i].Type == TokenAnnotation::TT_ConditionalExpr) {
       return false;
     }