diff --git a/front_end/browser_debugger/module.json b/front_end/browser_debugger/module.json
index 5593cb1d73..ca831aaf1d 100644
--- a/front_end/browser_debugger/module.json
+++ b/front_end/browser_debugger/module.json
@@ -2,7 +2,7 @@
     "extensions": [
         {
             "type": "view",
-            "location": "sources-sidebar",
+            "location": "sources.sidebar-bottom",
             "id": "sources.eventListenerBreakpoints",
             "title": "Event Listener Breakpoints",
             "order": 9,
@@ -18,7 +18,7 @@
         },
         {
             "type": "view",
-            "location": "sources-sidebar",
+            "location": "sources.sidebar-bottom",
             "id": "sources.xhrBreakpoints",
             "title": "XHR/fetch Breakpoints",
             "order": 5,
@@ -28,7 +28,7 @@
         },
         {
             "type": "view",
-            "location": "sources-sidebar",
+            "location": "sources.sidebar-bottom",
             "id": "sources.domBreakpoints",
             "title": "DOM Breakpoints",
             "order": 7,
@@ -67,7 +67,7 @@
         },
         {
             "type": "view",
-            "location": "sources-sidebar",
+            "location": "sources.sidebar-bottom",
             "id": "sources.globalListeners",
             "title": "Global Listeners",
             "order": 8,
diff --git a/front_end/sources/SourcesPanel.js b/front_end/sources/SourcesPanel.js
index 2860c05e77..40ad095b4a 100644
--- a/front_end/sources/SourcesPanel.js
+++ b/front_end/sources/SourcesPanel.js
@@ -251,7 +251,8 @@ Sources.SourcesPanel = class extends UI.Panel {
    * @return {?UI.ViewLocation}
    */
   resolveLocation(locationName) {
-    if (locationName === 'sources-sidebar')
+    if (locationName === 'sources.sidebar-top' || locationName === 'sources.sidebar-bottom' ||
+        locationName === 'sources.sidebar-tabs')
       return this._sidebarPaneStack;
     else
       return this._navigatorTabbedLocation;
@@ -899,6 +900,7 @@ Sources.SourcesPanel = class extends UI.Panel {
     this._sidebarPaneStack.widget().element.classList.add('overflow-auto');
     this._sidebarPaneStack.widget().show(vbox.element);
     this._sidebarPaneStack.widget().element.appendChild(this._debuggerPausedMessage.element());
+    this._sidebarPaneStack.appendApplicableItems('sources.sidebar-top');
     vbox.element.appendChild(this._debugToolbar.element);
 
     if (this._threadsSidebarPane)
@@ -937,11 +939,12 @@ Sources.SourcesPanel = class extends UI.Panel {
       this._splitWidget.installResizer(this._debugToolbar.gripElementForResize());
       tabbedLocation.appendView(scopeChainView);
       tabbedLocation.appendView(this._watchSidebarPane);
+      tabbedLocation.appendApplicableItems('sources.sidebar-tabs');
       this._extensionSidebarPanesContainer = tabbedLocation;
       this.sidebarPaneView = splitWidget;
     }
 
-    this._sidebarPaneStack.appendApplicableItems('sources-sidebar');
+    this._sidebarPaneStack.appendApplicableItems('sources.sidebar-bottom');
     const extensionSidebarPanes = Extensions.extensionServer.sidebarPanes();
     for (let i = 0; i < extensionSidebarPanes.length; ++i)
       this._addExtensionSidebarPane(extensionSidebarPanes[i]);
diff --git a/front_end/sources/module.json b/front_end/sources/module.json
index 9a72d3c253..aa91d7da77 100644
--- a/front_end/sources/module.json
+++ b/front_end/sources/module.json
@@ -715,11 +715,24 @@
         {
             "type": "@UI.ViewLocationResolver",
             "name": "navigator-view",
+            "category": "Sources",
             "className": "Sources.SourcesPanel"
         },
         {
             "type": "@UI.ViewLocationResolver",
-            "name": "sources-sidebar",
+            "name": "sources.sidebar-top",
+            "category": "Sources",
+            "className": "Sources.SourcesPanel"
+        },
+        {
+            "type": "@UI.ViewLocationResolver",
+            "name": "sources.sidebar-bottom",
+            "category": "Sources",
+            "className": "Sources.SourcesPanel"
+        },
+        {
+            "type": "@UI.ViewLocationResolver",
+            "name": "sources.sidebar-tabs",
             "category": "Sources",
             "className": "Sources.SourcesPanel"
         },