2 files changed, 10 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp
index 866ed29e..a82df79c 100644
--- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp
@@ -188,6 +188,15 @@ EStudioObjectType Qt3DSDMInspectable::getObjectType() const
     return getDoc()->GetStudioSystem()->GetClientDataModelBridge()->GetObjectType(m_instance);
 }
 
+bool Qt3DSDMInspectable::isValid() const
+{
+    if (m_activeSlideInstance) {
+        return getDoc()->GetStudioSystem()->IsInstance(m_instance)
+                && getDoc()->GetStudioSystem()->IsInstance(m_activeSlideInstance);
+    }
+    return getDoc()->GetStudioSystem()->IsInstance(m_instance);
+}
+
 bool Qt3DSDMInspectable::isMaster() const
 {
     ISlideSystem *slideSystem = getDoc()->GetStudioSystem()->GetSlideSystem();
diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.h b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.h
index 69aae6f5..0da2916d 100644
--- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.h
+++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.h
@@ -46,7 +46,7 @@ public:
     long getGroupCount() const override;
     CInspectorGroup *getGroup(long) override;
     EStudioObjectType getObjectType() const override;
-    bool isValid() const override { return true; } // asserted in the constructor
+    bool isValid() const override;
     bool isMaster() const override;
     qt3dsdm::Qt3DSDMInstanceHandle getInstance() const override { return m_instance; }
     virtual qt3dsdm::TMetaDataPropertyHandleList GetGroupProperties(long inGroupIndex);