1 files changed, 4 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 81bbc7754a7..f1042856e4c 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -36,7 +36,10 @@ class UnifiedPaintPanel():
         elif context.weight_paint_object:
             return toolsettings.weight_paint
         elif context.image_paint_object:
-            return toolsettings.image_paint
+            if (toolsettings.image_paint and toolsettings.image_paint.detect_data()):
+                return toolsettings.image_paint
+
+            return None
         elif context.particle_edit_object:
             return toolsettings.particle_edit