1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index 577f7a7af8a..fde8b8f85f8 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -785,8 +785,11 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
   SpaceProperties *sbuts = CTX_wm_space_properties(C);
   ButsContextPath *path = sbuts ? sbuts->path : NULL;
 
-  /* A zero sized path will be set for 'BCONTEXT_TOOL'. */
-  if (!path || !path->len) {
+  if (sbuts->mainb == BCONTEXT_TOOL) {
+    return 0;
+  }
+
+  if (!path) {
     return 0;
   }