diff --git a/src/sunstone/public/app/addons.js b/src/sunstone/public/app/addons.js
index e1ee9243ca..7f1c0fe369 100644
--- a/src/sunstone/public/app/addons.js
+++ b/src/sunstone/public/app/addons.js
@@ -1,10 +1,9 @@
 siteMap = {
 	addons: [
-
 	]
 };
 
-var path = "../addons/tabs/";
+var path = "addons/tabs/";
 var deps = [];
 siteMap.addons.forEach(function (addon) {
 	deps.push(path + addon);
diff --git a/src/sunstone/public/addons/README b/src/sunstone/public/app/addons/README
similarity index 100%
rename from src/sunstone/public/addons/README
rename to src/sunstone/public/app/addons/README
diff --git a/src/sunstone/public/addons/opennebula/README b/src/sunstone/public/app/addons/opennebula/README
similarity index 100%
rename from src/sunstone/public/addons/opennebula/README
rename to src/sunstone/public/app/addons/opennebula/README
diff --git a/src/sunstone/public/addons/tabs/README b/src/sunstone/public/app/addons/tabs/README
similarity index 100%
rename from src/sunstone/public/addons/tabs/README
rename to src/sunstone/public/app/addons/tabs/README
diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js
index 089795d4cc..53343c8864 100644
--- a/src/sunstone/public/app/sunstone.js
+++ b/src/sunstone/public/app/sunstone.js
@@ -33,6 +33,41 @@ define(function(require) {
   var CONFIRM_DIALOG_ID = require("utils/dialogs/confirm/dialogId");
   var CONFIRM_WITH_SELECT_DIALOG_ID = require("utils/dialogs/confirm-with-select/dialogId");
   var DASHBOARD_TAB_ID = require("tabs/dashboard-tab/tabId");
+  var DefaultTabsArr = [
+    "dashboard-tab",
+    "system-top-tab",
+    "users-tab",
+    "groups-tab",
+    "vdcs-tab",
+    "acls-tab",
+    "templates-top-tab",
+    "templates-tab",
+    "oneflow-templates-tab",
+    "vrouter-templates-tab",
+    "instances-top-tab",
+    "vms-tab",
+    "oneflow-services-tab",
+    "vrouters-tab",
+    "infrastructure-top-tab",
+    "clusters-tab",
+    "hosts-tab",
+    "zones-tab",
+    "storage-top-tab",
+    "datastores-tab",
+    "images-tab",
+    "files-tab",
+    "marketplaces-tab",
+    "marketplaceapps-tab",
+    "network-top-tab",
+    "vnets-tab",
+    "vnets-topology-tab",
+    "vnets-topology-tab",
+    "support-tab",
+    "settings-tab",
+    "upgrade-top-tab",
+    "vmgroup-tab",
+    "secgroups-tab"
+  ];
 
   var SunstoneCfg = {
     "actions" : {},
@@ -46,6 +81,9 @@ define(function(require) {
 
     $.each(Config.enabledTabs, function(i, tabName){
       var name = "./tabs/" + tabName;
+      if (DefaultTabsArr.indexOf(tabName) == -1){
+        name = "./addons/tabs/" + tabName
+      }
       var tabObj = require(name);
       var _tabId = tabObj.tabId;
       SunstoneCfg["tabs"][_tabId] = tabObj;
@@ -80,6 +118,9 @@ define(function(require) {
   var _addActions = function() {
     $.each(Config.allTabs(), function(i, tabName){
       var name = "./tabs/" + tabName;
+      if (DefaultTabsArr.indexOf(tabName) == -1){
+        name = "./addons/tabs/" + tabName
+      }
       var tabObj = require(name);
 
       var actions = tabObj.actions;
diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb
index ec606857d2..9c1e0285d0 100644
--- a/src/sunstone/views/index.erb
+++ b/src/sunstone/views/index.erb
@@ -105,11 +105,10 @@
 
     <% if $conf[:env] == 'dev' %>
       <script src="bower_components/requirejs/require.js" data-main="app/main"></script>
+      <script>require(["main","addons"]);</script>
     <% else %>
       <script src="bower_components/requirejs/require.js"></script>
-      <script>
-        require(["dist/main", "app/addons"]);
-      </script>
+      <script>require(["dist/main", "app/addons"]);</script>
     <% end %>
   </body>
 </html>