diff --git a/SDK/src/NDK/BaseWidget.cpp b/SDK/src/NDK/BaseWidget.cpp
index 07f9afa9f..be7049938 100644
--- a/SDK/src/NDK/BaseWidget.cpp
+++ b/SDK/src/NDK/BaseWidget.cpp
@@ -212,6 +212,9 @@ namespace Ndk
 			auto it = std::find_if(m_entities.begin(), m_entities.end(), [&](const WidgetEntity& widgetEntity) { return widgetEntity.handle == entity; });
 			NazaraAssert(it != m_entities.end(), "Entity does not belong to this widget");
 
+			if (!IsVisible())
+				entity->Disable(); // Next line will override isEnabled status
+
 			it->isEnabled = true;
 		});