diff --git a/src/routes/Discover/Discover.js b/src/routes/Discover/Discover.js
index 52d24ff7c..5bc5c9517 100644
--- a/src/routes/Discover/Discover.js
+++ b/src/routes/Discover/Discover.js
@@ -1,15 +1,15 @@
 const React = require('react');
-const { MainNavBar, MetaItem, MetaPreview } = require('stremio-common');
+const { MainNavBar, MetaItem, MetaPreview } = require('stremio/common');
 const PickerMenu = require('./PickerMenu');
 const useCatalog = require('./useCatalog');
 const styles = require('./styles');
 
-// TODO impl refocus to left of the scroll view
 const Discover = ({ urlParams, queryParams }) => {
     const [pickers, metaItems] = useCatalog(urlParams, queryParams);
-    const [selectedItem, setSelectedItem] = React.useState(metaItems[0]);
+    const [selectedItem, setSelectedItem] = React.useState(null);
     const changeMetaItem = React.useCallback((event) => {
-        const metaItem = metaItems.find(({ id }) => id === event.currentTarget.dataset.metaItemId);
+        const { metaItemId } = event.currentTarget.dataset;
+        const metaItem = metaItems.find(({ id }) => id === metaItemId);
         setSelectedItem(metaItem);
     }, [metaItems]);
     return (