diff --git a/frontend/app/components/shared/SavedSearch/SavedSearch.tsx b/frontend/app/components/shared/SavedSearch/SavedSearch.tsx
index b67b318be..2965c6a4d 100644
--- a/frontend/app/components/shared/SavedSearch/SavedSearch.tsx
+++ b/frontend/app/components/shared/SavedSearch/SavedSearch.tsx
@@ -5,8 +5,9 @@ import { connect } from 'react-redux';
 import { fetchList as fetchListSavedSearch } from 'Duck/search';
 import OutsideClickDetectingDiv from 'Shared/OutsideClickDetectingDiv';
 import cn from 'classnames';
-import { list } from 'App/components/BugFinder/CustomFilters/filterModal.css';
 import stl from './SavedSearch.css';
+import { useModal } from 'App/components/Modal';
+import SavedSearchModal from './components/SavedSearchModal'
 
 interface Props {
   fetchListSavedSearch: () => void;
@@ -17,6 +18,7 @@ function SavedSearch(props) {
   const { list } = props;
   const { savedSearch }  = props;
   const [showMenu, setShowMenu] = useState(false)
+  const { showModal } = useModal();
 
   useEffect(() => {
     props.fetchListSavedSearch()
@@ -24,14 +26,13 @@ function SavedSearch(props) {
 
   return (
     <OutsideClickDetectingDiv
-      // className={ cn("relative", { "flex-1" : fullWidth }) }
       onClickOutside={() => setShowMenu(false)}
     >
       <div className="relative">
         <div className={cn("flex items-center", { [stl.disabled] : list.size === 0})}>
           <Button outline size="small"
             className="flex items-center"
-            onClick={() => setShowMenu(true)}
+            onClick={() => showModal(<SavedSearchModal list={list} />, { right: true })}
           >
             <span className="mr-1">Saved Search</span>
             <span className="font-bold mr-2">{list.size}</span>
diff --git a/frontend/app/components/shared/SavedSearch/components/SavedSearchModal/SavedSearchModal.tsx b/frontend/app/components/shared/SavedSearch/components/SavedSearchModal/SavedSearchModal.tsx
new file mode 100644
index 000000000..3ed032796
--- /dev/null
+++ b/frontend/app/components/shared/SavedSearch/components/SavedSearchModal/SavedSearchModal.tsx
@@ -0,0 +1,112 @@
+import React, { MouseEvent, useState } from 'react'
+import cn from 'classnames';
+import { Icon as SemIcon } from 'semantic-ui-react';
+import { Icon, Input } from 'UI';
+import { List } from 'immutable';
+import { Tooltip } from 'react-tippy'
+import { confirm } from 'UI/Confirmation';
+import { applySavedSearch, remove, editSavedSearch } from 'Duck/search'
+import { connect } from 'react-redux';
+import { useModal } from 'App/components/Modal';
+import { SavedSearch } from 'Types/ts/search'
+import SaveSearchModal from 'Shared/SaveSearchModal'
+import stl from './savedSearchModal.css'
+
+
+interface ITooltipIcon {
+    title: string;
+    name: string;
+    onClick: (item: any, e: MouseEvent<HTMLButtonElement>) => void;
+}
+function TooltipIcon(props: ITooltipIcon) {
+    return (
+        // @ts-ignore - problem with react-tippy types TODO: remove after fix
+        <Tooltip
+            delay={250}
+            title={props.title}
+            hideOnClick={true}
+            position="bottom"
+        >
+            <Icon size="24" name={props.name} color="main" onClick={props.onClick} />
+        </Tooltip>
+    )
+}
+
+interface Props {
+    list: List<SavedSearch>;
+    applySavedSearch: (item: SavedSearch) => void;
+    remove: (itemId: number) => void;
+    editSavedSearch: (item: SavedSearch) => void;
+}
+function SavedSearchModal(props: Props) {
+    const { hideModal } = useModal();
+    const [showModal, setshowModal] = useState(false)
+    const [filterQuery, setFilterQuery] = useState('')
+
+    const onClick = (item: SavedSearch) => {
+        props.applySavedSearch(item);
+        hideModal();
+    }
+    const onDelete = async (item: SavedSearch, e: MouseEvent<HTMLButtonElement>) => {
+        e.stopPropagation();
+        const confirmation = await confirm({
+            header: 'Confirm',
+            confirmButton: 'Yes, delete',
+            confirmation: 'Are you sure you want to permanently delete this search?'
+        })
+        if (confirmation) {
+            props.remove(item.searchId)
+        }
+    }
+    const onEdit = (item: SavedSearch, e: MouseEvent<HTMLButtonElement>) => {
+        e.stopPropagation();
+        props.editSavedSearch(item);
+        setTimeout(() => setshowModal(true), 0);
+    }
+
+    const shownItems = props.list.filter(item => item.name.includes(filterQuery))
+    console.log(shownItems, filterQuery)
+    return (
+        <div className="bg-white box-shadow h-screen" style={{ width: '450px' }}>
+            <div className="p-6">
+                <h1 className="text-2xl">Saved Search  <span className={stl.secondary}>{props.list.size}</span></h1>
+            </div>
+            {props.list.size > 9 && (
+                <div className={cn(stl.inputContainer, 'mb-6')}>
+                    <Input
+                        className={stl.inputComponent}
+                        iconPosition="left"
+                        icon={<SemIcon name="search" />}
+                        onChange={(_, v) => setFilterQuery(v.value)}
+                        placeholder="Filter by name"
+                    />
+                </div>
+            )}
+            {shownItems.map(item => (
+                <div key={item.key} className={cn('px-6 py-4 cursor-pointer flex items-start', stl.rowItem)} onClick={() => onClick(item)}>
+                    <Icon name="search" color="gray-medium" size="24" />
+                    <div className="ml-4">
+                        <div className="text-xl">{item.name} </div>
+                        {item.isPublic && (
+                            <div className={cn(stl.iconContainer, stl.secondary, 'flex items-center px-2 mt-2')}>
+                                <Icon name="user-friends" size="11" />
+                                <div className="ml-1 text-sm"> Team </div>
+                            </div>
+                        )}
+                    </div>
+                    <div className="flex items-center ml-auto self-center">
+                        <div className={stl.iconCircle}>
+                            <TooltipIcon name="pencil" onClick={onEdit} title="Rename" />
+                        </div>
+                        <div className={stl.iconCircle}>
+                            <TooltipIcon name="trash" onClick={onEdit} title="Delete" />
+                        </div>
+                    </div>
+                </div>
+            ))}
+             { showModal && ( <SaveSearchModal show closeHandler={() => setshowModal(false)} /> )}
+        </div>
+    )
+}
+
+export default React.memo(connect(null, { applySavedSearch, remove, editSavedSearch })(SavedSearchModal))
diff --git a/frontend/app/components/shared/SavedSearch/components/SavedSearchModal/index.ts b/frontend/app/components/shared/SavedSearch/components/SavedSearchModal/index.ts
new file mode 100644
index 000000000..7a07b7eb0
--- /dev/null
+++ b/frontend/app/components/shared/SavedSearch/components/SavedSearchModal/index.ts
@@ -0,0 +1 @@
+export {default} from './SavedSearchModal'
diff --git a/frontend/app/components/shared/SavedSearch/components/SavedSearchModal/savedSearchModal.css b/frontend/app/components/shared/SavedSearch/components/SavedSearchModal/savedSearchModal.css
new file mode 100644
index 000000000..4049bbe32
--- /dev/null
+++ b/frontend/app/components/shared/SavedSearch/components/SavedSearchModal/savedSearchModal.css
@@ -0,0 +1,40 @@
+.secondary {
+    color: rgba(0, 0, 0, 0.6);
+}
+
+.rowItem {
+    border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+
+    &:hover {
+        background-color: rgba(63, 81, 181, 0.08);
+
+        & .iconCircle {
+            opacity: 1;
+        }
+    }
+}
+
+.iconContainer {
+    background-color: #f3f3f3;
+    border-radius: 100px;
+    width: 62px;
+}
+
+.iconCircle {
+    border-radius: 50%;
+    padding: 6px;
+    opacity: 0;
+
+    &:hover {
+        background: rgba(63, 81, 181, 0.08);
+    }
+}
+
+.inputContainer {
+    padding: 0 2em;
+    width: 100%;
+}
+
+.inputComponent {
+    width: 100%;
+}
diff --git a/frontend/app/types/ts/search.ts b/frontend/app/types/ts/search.ts
new file mode 100644
index 000000000..1c45bbe56
--- /dev/null
+++ b/frontend/app/types/ts/search.ts
@@ -0,0 +1,14 @@
+import { List } from 'immutable';
+
+export interface SavedSearch {
+    count: number;
+    createdAt: number;
+    filter: Record<string, any>;
+    isPublic: boolean;
+    key: string;
+    name: string;
+    projectId: number;
+    searchId: number;
+    userId: number;
+    watchdogs: List<any>
+}