diff --git a/lib/content-services/content-node-selector/content-node-selector-panel.component.spec.ts b/lib/content-services/content-node-selector/content-node-selector-panel.component.spec.ts
index 86cb20dd58..b4c8b1302f 100644
--- a/lib/content-services/content-node-selector/content-node-selector-panel.component.spec.ts
+++ b/lib/content-services/content-node-selector/content-node-selector-panel.component.spec.ts
@@ -462,6 +462,26 @@ describe('ContentNodeSelectorComponent', () => {
                 expect(component.showingSearchResults).toBeFalsy();
             });
 
+            it('should show nodes from the same folder as selected in the dropdown on clearing the search input', (done) => {
+                typeToSearchBox('piccolo');
+
+                setTimeout(() => {
+                    expect(searchSpy.calls.count()).toBe(1);
+
+                    component.siteChanged(<SiteEntry> { entry: { guid: 'namek' } });
+
+                    expect(searchSpy.calls.count()).toBe(2);
+                    expect(searchSpy.calls.argsFor(1)).toEqual([defaultSearchOptions('piccolo', 'namek')]);
+
+                    component.clear();
+
+                    expect(component.searchTerm).toBe('');
+                    expect(component.folderIdToShow).toBe('namek');
+                    done();
+                }, 300);
+
+            });
+
             it('should show the current folder\'s content instead of search results if search was not performed', () => {
                 let documentList = fixture.debugElement.query(By.directive(DocumentListComponent));
                 expect(documentList).not.toBeNull('Document list should be shown');
diff --git a/lib/content-services/content-node-selector/content-node-selector-panel.component.ts b/lib/content-services/content-node-selector/content-node-selector-panel.component.ts
index 0e49b6fdb6..b5d2cd061c 100644
--- a/lib/content-services/content-node-selector/content-node-selector-panel.component.ts
+++ b/lib/content-services/content-node-selector/content-node-selector-panel.component.ts
@@ -175,7 +175,7 @@ export class ContentNodeSelectorPanelComponent implements OnInit {
         this.skipCount = 0;
         this.chosenNode = null;
         this.showingSearchResults = false;
-        this.folderIdToShow = this.currentFolderId;
+        this.folderIdToShow = this.siteId || this.currentFolderId;
     }
 
     /**