diff --git a/src/parse-result.test.ts b/src/parse-result.test.ts
index 003bd0e7..688bca81 100644
--- a/src/parse-result.test.ts
+++ b/src/parse-result.test.ts
@@ -1,4 +1,4 @@
-import { builders, parse, print, transform } from '.';
+import { builders, parse, print, transform, traverse } from '.';
 import type { ASTv1 as AST } from '@glimmer/syntax';
 import stripIndent from 'outdent';
 
@@ -550,6 +550,25 @@ describe('ember-template-recast', function () {
       `);
     });
 
+    test('issue can handle angle brackets in modifier argument values', function () {
+      let template = `
+        <Select
+          @placeholder={{do-something ">> Some Text Here"}}
+          @options={{this.items}}
+          as |item|
+        >
+          {{item.name}}
+        </Select>
+      `;
+      let ast = parse(template);
+      traverse(ast, {
+        ElementNode(node) {
+          node.tag = `${node.tag}`;
+        },
+      });
+      expect(print(ast)).toEqual(template);
+    });
+
     test('issue 706', function () {
       let template = `<div
   class="pt-2 pb-4 {{this.foo}}"
diff --git a/src/parse-result.ts b/src/parse-result.ts
index 005530dc..90808d36 100644
--- a/src/parse-result.ts
+++ b/src/parse-result.ts
@@ -513,7 +513,10 @@ export default class ParseResult {
               blockParamsEndIndex + 1
             );
 
-            const closeOpenIndex = nodeInfo.source.indexOf(selfClosing ? '/>' : '>');
+            // Match closing index after start of block params to avoid closing tag if /> or > encountered in string
+            const closeOpenIndex =
+              nodeInfo.source.substring(blockParamStartIndex).indexOf(selfClosing ? '/>' : '>') +
+              blockParamStartIndex;
             postBlockParamsWhitespace = nodeInfo.source.substring(
               blockParamsEndIndex + 1,
               closeOpenIndex