diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
index f90f607e9d..a2c0ff534e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
@@ -4,7 +4,7 @@
       ng-if="entityType !== 'media'">
 
       <umb-content-grid
-         ng-if="items || !items && !options.filter"
+         ng-if="items"
          content="items"
          content-properties="options.includeProperties"
          on-click="vm.selectContentItem"
@@ -12,9 +12,15 @@
       </umb-content-grid>
 
       <umb-empty-state
-          ng-if="!items && options.filter"
+          ng-if="!items && options.filter.length > 0"
           position="center">
-          Sorry, we can not find what you are looking for
+          <localize key="general_searchNoResult"></localize>
+      </umb-empty-state>
+
+      <umb-empty-state
+          ng-if="!items && vm.isRecycleBin"
+          position="center">
+          <localize key="general_recycleBinEmpty"></localize>
       </umb-empty-state>
 
    </div>
@@ -31,7 +37,7 @@
          files-uploaded="vm.onUploadComplete"
          accept="{{vm.acceptedFileTypes}}"
          max-file-size="{{vm.maxFileSize}}"
-         hide-dropzone="{{!vm.activeDrag && items.length > 0 || !items && options.filter }}"
+         hide-dropzone="{{ options.filter.length > 0 }}"
          compact="{{ items.length > 0 }}"
          files-queued="vm.onFilesQueue">
       </umb-file-dropzone>
@@ -68,9 +74,9 @@
       </umb-empty-state>
 
       <umb-empty-state
-          ng-if="vm.itemsWithoutFolders.length === 0 && options.filter"
+          ng-if="vm.itemsWithoutFolders.length === 0 && options.filter.length > 0"
           position="center">
-          Sorry, we can not find what you are looking for
+          <localize key="general_searchNoResult"></localize>
       </umb-empty-state>
 
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
index a8a1ac0766..d4ca07aede 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
@@ -19,7 +19,7 @@
       vm.activeDrag = false;
       vm.mediaDetailsTooltip = {};
       vm.itemsWithoutFolders = [];
-      vm.isRecycleBin = $scope.contentId === '-21';
+      vm.isRecycleBin = $scope.contentId === '-21' || $scope.contentId === '-20';
 
       vm.dragEnter = dragEnter;
       vm.dragLeave = dragLeave;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
index 24f1dabf33..276274dce3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
@@ -14,7 +14,7 @@
            files-uploaded="vm.onUploadComplete"
            accept="{{vm.acceptedFileTypes}}"
            max-file-size="{{vm.maxFileSize}}"
-           hide-dropzone="{{!vm.activeDrag && items.length > 0 || !items && options.filter }}"
+           hide-dropzone="{{options.filter.length > 0}}"
            compact="{{ items.length > 0 }}"
            files-queued="vm.onFilesQueue">
         </umb-file-dropzone>
@@ -31,18 +31,12 @@
             on-sort="vm.sort">
         </umb-table>
 
-        <umb-empty-state
-            ng-if="!items && vm.isRecycleBin"
-            position="center">
-            <localize key="general_recycleBinEmpty"></localize>
-        </umb-empty-state>
-
     </div>
 
     <div ng-if="entityType !== 'media'">
 
         <umb-table
-            ng-if="items || !items && !options.filter"
+            ng-if="items"
             items="items"
             item-properties="options.includeProperties"
             on-select="vm.selectItem"
@@ -56,9 +50,15 @@
     </div>
 
     <umb-empty-state
-        ng-if="!items && options.filter"
+        ng-if="!items && options.filter.length > 0"
         position="center">
-        Sorry, we can not find what you are looking for
+        <localize key="general_searchNoResult"></localize>
+    </umb-empty-state>
+
+    <umb-empty-state
+        ng-if="!items && vm.isRecycleBin"
+        position="center">
+        <localize key="general_recycleBinEmpty"></localize>
     </umb-empty-state>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
index 59327524d6..8a2de97f0e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
@@ -10,7 +10,7 @@
         vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
         vm.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB";
         vm.activeDrag = false;
-        vm.isRecycleBin = $scope.contentId === '-21';
+        vm.isRecycleBin = $scope.contentId === '-21' || $scope.contentId === '-20';
 
         vm.selectItem = selectItem;
         vm.clickItem = clickItem;
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 258173ce0f..cd0067bf78 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -448,6 +448,7 @@
     <key alias="retry">Retry</key>
     <key alias="rights">Permissions</key>
     <key alias="search">Search</key>
+    <key alias="searchNoResult">Sorry, we can not find what you are looking for</key>
     <key alias="server">Server</key>
     <key alias="show">Show</key>
     <key alias="showPageOnSend">Show page on Send</key>