diff --git a/src/kiwano/2d/Actor.cpp b/src/kiwano/2d/Actor.cpp
index 5cbd0f20..80935bba 100644
--- a/src/kiwano/2d/Actor.cpp
+++ b/src/kiwano/2d/Actor.cpp
@@ -148,6 +148,9 @@ void Actor::PrepareToRender(RenderContext& ctx)
 
 void Actor::RenderBorder(RenderContext& ctx)
 {
+    if (!visible_)
+        return;
+
     if (show_border_ && !size_.IsOrigin())
     {
         Rect bounds = GetBounds();
@@ -373,7 +376,7 @@ void Actor::SetStage(Stage* stage)
         stage_ = stage;
         for (auto& child : children_)
         {
-            child->stage_ = stage;
+            child->SetStage(stage);
         }
     }
 }