1 files changed, 6 insertions, 3 deletions
diff --git a/modern/src/DevicesList.js b/modern/src/DevicesList.js
index 5f7892c..c5f2413 100644
--- a/modern/src/DevicesList.js
+++ b/modern/src/DevicesList.js
@@ -18,7 +18,7 @@ import { devicesActions, uiActions } from './store';
 import EditCollectionView from './EditCollectionView';
 import { useEffectAsync } from './reactHelper';
 import { formatPosition } from './common/formatter';
-import { getDevices, getPosition } from './common/selectors';
+import { getDevices, getFilteredDevices, getPosition } from './common/selectors';
 import { useTranslation } from './LocalizationProvider';
 
 const useStyles = makeStyles((theme) => ({
@@ -136,7 +136,10 @@ const DeviceView = ({ updateTimestamp, onMenuClick }) => {
   const dispatch = useDispatch();
   const listInnerEl = useRef(null);
 
-  const items = useSelector(getDevices);
+  const filteredItems = useSelector(getFilteredDevices);
+  const unfilteredItems = useSelector(getDevices);
+  
+  const items = filteredItems.length > 0 ? filteredItems : unfilteredItems;
 
   if (listInnerEl.current) {
     listInnerEl.current.className = classes.listInner;
@@ -157,7 +160,7 @@ const DeviceView = ({ updateTimestamp, onMenuClick }) => {
             width={width}
             height={height}
             itemCount={items.length}
-            itemData={{ items, onMenuClick }}
+            itemData={{items, onMenuClick}}
             itemSize={92}
             overscanCount={10}
             innerRef={listInnerEl}