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