diff --git a/client/homebrew/pages/vaultPage/vaultPage.jsx b/client/homebrew/pages/vaultPage/vaultPage.jsx
index 40cc77ca6..328348893 100644
--- a/client/homebrew/pages/vaultPage/vaultPage.jsx
+++ b/client/homebrew/pages/vaultPage/vaultPage.jsx
@@ -45,7 +45,7 @@ const VaultPage = (props)=>{
 	const v3Ref           = useRef(null);
 	const legacyRef       = useRef(null);
 	const submitButtonRef = useRef(null);
-	const [tagsList, setTagList] = useState([]);
+	const [tagsList, setTagList] = useState(props.query.tags.split(',') || []);
 
 	useEffect(()=>{
 		disableSubmitIfFormInvalid();