diff --git a/core/controllers/admin_dashboard.php b/core/controllers/admin_dashboard.php
index bd295b84..a3e08d4f 100644
--- a/core/controllers/admin_dashboard.php
+++ b/core/controllers/admin_dashboard.php
@@ -20,7 +20,8 @@
 class Admin_Dashboard_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
-    $view->content = $view->admin_dashboard_blocks();
+    $view->content = new View("admin_dashboard_main.html");
+    $view->sidebar = new View("admin_dashboard_sidebar.html");
     print $view;
   }
 }
diff --git a/core/views/admin_dashboard_main.html.php b/core/views/admin_dashboard_main.html.php
new file mode 100644
index 00000000..cfe7bac2
--- /dev/null
+++ b/core/views/admin_dashboard_main.html.php
@@ -0,0 +1,2 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?= $theme->admin_dashboard_blocks() ?>
diff --git a/core/views/admin_dashboard_sidebar.html.php b/core/views/admin_dashboard_sidebar.html.php
new file mode 100644
index 00000000..b9bce0ef
--- /dev/null
+++ b/core/views/admin_dashboard_sidebar.html.php
@@ -0,0 +1,14 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div id="gAvailableBlocks" class="gBlock">
+  <form class="gBlockContent">
+    <fieldset>
+      <legend>Add Dashboard Blocks</legend>
+      <label for="">Available blocks</label>
+      <select name="" id="">
+        <option>Somthing</option>
+        <option>Somthing else</option>
+      </select>
+    </fieldset>
+  </form>
+</div>
+<?= $theme->admin_sidebar_blocks() ?>
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index c94e64ee..e8c25f84 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -52,21 +52,11 @@
             </div>
           </div>
         </div>
+        <? if ($sidebar): ?>
         <div id="gSidebar" class="yui-b">
-          <div id="gAvailableBlocks" class="gBlock">
-            <form class="gBlockContent">
-              <fieldset>
-                <legend>Add Dashboard Blocks</legend>
-                <label for="">Available blocks</label>
-                <select name="" id="">
-                  <option>Somthing</option>
-                  <option>Somthing else</option>
-                </select>
-              </fieldset>
-            </form>
-          </div>
-          <?= $theme->admin_sidebar_blocks() ?>
+          <?= $sidebar ?>
         </div>
+        <? endif ?>
       </div>
       <div id="ft">
         <div id="gFooter">