diff --git a/queries/ecma/textobjects.scm b/queries/ecma/textobjects.scm
index f84acc8f..7e653661 100644
--- a/queries/ecma/textobjects.scm
+++ b/queries/ecma/textobjects.scm
@@ -113,8 +113,8 @@
     ")") @call.outer)
 
 ; blocks
-(_
-  (statement_block) @block.inner) @block.outer
+(statement_block
+  (_)* @block.inner) @block.outer
 
 ; parameters
 ; function ({ x }) ...
diff --git a/queries/rust/textobjects.scm b/queries/rust/textobjects.scm
index 69aa90e9..6bffb50b 100644
--- a/queries/rust/textobjects.scm
+++ b/queries/rust/textobjects.scm
@@ -108,11 +108,11 @@
     "}")) @loop.outer
 
 ; blocks
-(_
-  (block) @block.inner) @block.outer
+(block
+  (_)* @block.inner) @block.outer
 
 (unsafe_block
-  (_)? @block.inner) @block.outer
+  (_)* @block.inner) @block.outer
 
 ; calls
 (macro_invocation) @call.outer