diff --git a/modules/cms/classes/CodeBase.php b/modules/cms/classes/CodeBase.php
index a3013cf4a..4fc9eb9bd 100644
--- a/modules/cms/classes/CodeBase.php
+++ b/modules/cms/classes/CodeBase.php
@@ -122,6 +122,10 @@ class CodeBase extends Extendable implements ArrayAccess
      */
     public function __get($name)
     {
+        if (isset($this->page->components[$name]) || isset($this->layout->components[$name])) {
+            return $this[$name];
+        }
+
         if (($value = $this->page->{$name}) !== null) {
             return $value;
         }