diff --git a/src/App/routerViewsConfig.js b/src/App/routerViewsConfig.js
index f2d92cff7..645345022 100644
--- a/src/App/routerViewsConfig.js
+++ b/src/App/routerViewsConfig.js
@@ -21,6 +21,10 @@ const routerViewsConfig = [
             ...routesRegexp.library,
             component: routes.Library
         },
+        {
+            ...routesRegexp.continuewatching,
+            component: routes.Library
+        },
         {
             ...routesRegexp.search,
             component: routes.Search
diff --git a/src/common/routesRegexp.js b/src/common/routesRegexp.js
index f7cd674f3..decca5f5a 100644
--- a/src/common/routesRegexp.js
+++ b/src/common/routesRegexp.js
@@ -15,6 +15,10 @@ const routesRegexp = {
         regexp: /^\/library(?:\/([^/]*))?$/,
         urlParamsNames: ['type']
     },
+    continuewatching: {
+        regexp: /^\/continuewatching(?:\/([^/]*))?$/,
+        urlParamsNames: ['type']
+    },
     search: {
         regexp: /^\/search$/,
         urlParamsNames: []
diff --git a/src/routes/Library/Library.js b/src/routes/Library/Library.js
index 5ca126290..7fb4a3572 100644
--- a/src/routes/Library/Library.js
+++ b/src/routes/Library/Library.js
@@ -1,14 +1,15 @@
 const React = require('react');
 const PropTypes = require('prop-types');
 const classnames = require('classnames');
-const { Button, Multiselect, MainNavBars, LibItem, useProfile } = require('stremio/common');
+const NotFound = require('stremio/routes/NotFound');
+const { Button, Multiselect, MainNavBars, LibItem, useProfile, routesRegexp } = require('stremio/common');
 const useLibrary = require('./useLibrary');
 const useSelectableInputs = require('./useSelectableInputs');
 const styles = require('./styles');
 
-const Library = ({ urlParams, queryParams }) => {
+const Library = ({ model, urlParams, queryParams }) => {
     const profile = useProfile();
-    const library = useLibrary(urlParams, queryParams);
+    const library = useLibrary(model, urlParams, queryParams);
     const [typeSelect, sortSelect] = useSelectableInputs(library);
     return (
         <MainNavBars className={styles['library-container']} route={'library'}>
@@ -58,10 +59,38 @@ const Library = ({ urlParams, queryParams }) => {
 };
 
 Library.propTypes = {
-    urlParams: PropTypes.exact({
+    model: PropTypes.string,
+    urlParams: PropTypes.shape({
         type: PropTypes.string
     }),
     queryParams: PropTypes.instanceOf(URLSearchParams)
 };
 
-module.exports = Library;
+module.exports = ({ urlParams, queryParams }) => {
+    const model = React.useMemo(() => {
+        return typeof urlParams.path === 'string' ?
+            urlParams.path.match(routesRegexp.library.regexp) ?
+                'library'
+                :
+                urlParams.path.match(routesRegexp.continuewatching.regexp) ?
+                    'continue_watching'
+                    :
+                    null
+            :
+            null;
+    }, [urlParams.path]);
+    if (typeof model === 'string') {
+        return (
+            <Library
+                key={model}
+                model={model}
+                urlParams={urlParams}
+                queryParams={queryParams}
+            />
+        );
+    } else {
+        return (
+            <NotFound />
+        );
+    }
+};
diff --git a/src/routes/Library/useLibrary.js b/src/routes/Library/useLibrary.js
index cad2bea95..a9dd2c478 100644
--- a/src/routes/Library/useLibrary.js
+++ b/src/routes/Library/useLibrary.js
@@ -26,7 +26,7 @@ const mapLibraryState = (library) => {
     return { selected, type_names, lib_items };
 };
 
-const useLibrary = (urlParams, queryParams) => {
+const useLibrary = (libraryModel, urlParams, queryParams) => {
     const loadLibraryAction = React.useMemo(() => ({
         action: 'Load',
         args: {
@@ -38,7 +38,7 @@ const useLibrary = (urlParams, queryParams) => {
         }
     }), [urlParams, queryParams]);
     return useModelState({
-        model: 'library',
+        model: libraryModel,
         action: loadLibraryAction,
         map: mapLibraryState,
         init: initLibraryState