diff --git a/src/Box/Navigation.php b/src/Box/Navigation.php
index 59c5c066..91fbc4f1 100644
--- a/src/Box/Navigation.php
+++ b/src/Box/Navigation.php
@@ -29,7 +29,7 @@ class Navigation
             $name
         );
 
-        if ($config->interface->window->navigation->button->home)
+        if ($config->interface->window->navigation->button->home && $config->homepage)
         {
             $this->home = new \Yggverse\Yoda\Button\Home();
 
diff --git a/src/Box/Tab.php b/src/Box/Tab.php
index e9bbc69e..37f2a2d9 100644
--- a/src/Box/Tab.php
+++ b/src/Box/Tab.php
@@ -109,19 +109,22 @@ class Tab
             }
         );
 
-        $this->navigation->home->button->connect(
-            'released',
-            function ($entry)
-            {
-                $this->navigation->address->entry->set_text(
-                    $this->config->homepage
-                );
+        if ($this->config->homepage)
+        {
+            $this->navigation->home->button->connect(
+                'released',
+                function ($entry)
+                {
+                    $this->navigation->address->entry->set_text(
+                        $this->config->homepage
+                    );
 
-                $this->navigate(
-                    $this->config->homepage
-                );
-            }
-        );
+                    $this->navigate(
+                        $this->config->homepage
+                    );
+                }
+            );
+        }
 
         // @TODO back, forward buttons
     }