diff --git a/queries/python/textobjects.scm b/queries/python/textobjects.scm
index 481de212..0650bc5e 100644
--- a/queries/python/textobjects.scm
+++ b/queries/python/textobjects.scm
@@ -1,14 +1,10 @@
-(function_definition
-  body: (block)? @function.inner) @function.outer
+((decorated_definition)?
+  (function_definition
+    body: (block)? @function.inner)) @function.outer
 
-(decorated_definition
-  (function_definition)) @function.outer
-
-(class_definition
-  body: (block)? @class.inner) @class.outer
-
-(decorated_definition
-  (class_definition)) @class.outer
+((decorated_definition)?
+  (class_definition
+    body: (block)? @class.inner)) @class.outer
 
 (while_statement
   body: (block)? @loop.inner) @loop.outer