diff --git a/suite/common/sidebar/sidebarOverlay.js b/suite/common/sidebar/sidebarOverlay.js
index 82ae37038452..4396fed7ad8c 100644
--- a/suite/common/sidebar/sidebarOverlay.js
+++ b/suite/common/sidebar/sidebarOverlay.js
@@ -1240,6 +1240,7 @@ function SidebarShowHide() {
 function SidebarBuildPickerPopup() {
   var menu = document.getElementById('sidebar-panel-picker-popup');
   menu.database.AddDataSource(RDF.GetDataSource(sidebarObj.datasource_uri));
+  menu.builder.rebuild();
 
   for (var ii=3; ii < menu.childNodes.length; ii++) {
     var panel_menuitem = menu.childNodes.item(ii);
@@ -1251,7 +1252,6 @@ function SidebarBuildPickerPopup() {
       panel_menuitem.setAttribute('checked', 'true');
     }
   }
-  menu.builder.rebuild();
 }
 
 function SidebarTogglePanel(panel_menuitem) {