diff --git a/frontend/web/src/components/CreateCollectionDrawer.tsx b/frontend/web/src/components/CreateCollectionDrawer.tsx
index 2cd71f9..9317b5b 100644
--- a/frontend/web/src/components/CreateCollectionDrawer.tsx
+++ b/frontend/web/src/components/CreateCollectionDrawer.tsx
@@ -10,6 +10,7 @@ import { Visibility } from "@/types/proto/api/v2/common";
 import { convertVisibilityFromPb } from "@/utils/visibility";
 import useLoading from "../hooks/useLoading";
 import Icon from "./Icon";
+import ResourceNameInput from "./ResourceNameInput";
 import ShortcutView from "./ShortcutView";
 
 interface Props {
@@ -33,8 +34,9 @@ const CreateCollectionDrawer: React.FC<Props> = (props: Props) => {
     }),
   });
   const [selectedShortcuts, setSelectedShortcuts] = useState<Shortcut[]>([]);
-  const requestState = useLoading(false);
   const isCreating = isUndefined(collectionId);
+  const loadingState = useLoading(!isCreating);
+  const requestState = useLoading(false);
   const unselectedShortcuts = shortcutList
     .filter((shortcut) => {
       if (state.collectionCreate.visibility === Visibility.PUBLIC) {
@@ -63,11 +65,16 @@ const CreateCollectionDrawer: React.FC<Props> = (props: Props) => {
               .map((shortcutId) => shortcutList.find((shortcut) => shortcut.id === shortcutId))
               .filter(Boolean) as Shortcut[]
           );
+          loadingState.setFinish();
         }
       }
     })();
   }, [collectionId]);
 
+  if (loadingState.isLoading) {
+    return null;
+  }
+
   const setPartialState = (partialState: Partial<State>) => {
     setState({
       ...state,
@@ -75,10 +82,10 @@ const CreateCollectionDrawer: React.FC<Props> = (props: Props) => {
     });
   };
 
-  const handleNameInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const handleNameChange = (name: string) => {
     setPartialState({
       collectionCreate: Object.assign(state.collectionCreate, {
-        name: e.target.value.replace(/\s+/g, "-"),
+        name: name.replace(/\s+/g, "-"),
       }),
     });
   };
@@ -154,20 +161,7 @@ const CreateCollectionDrawer: React.FC<Props> = (props: Props) => {
       <ModalClose />
       <DialogContent className="max-w-full sm:max-w-sm">
         <div className="overflow-y-auto w-full mt-2 px-3 pb-4">
-          <div className="w-full flex flex-col justify-start items-start mb-3">
-            <span className="mb-2">
-              Name <span className="text-red-600">*</span>
-            </span>
-            <div className="relative w-full">
-              <Input
-                className="w-full"
-                type="text"
-                placeholder="Should be an unique name and will be put in url"
-                value={state.collectionCreate.name}
-                onChange={handleNameInputChange}
-              />
-            </div>
-          </div>
+          <ResourceNameInput name={state.collectionCreate.name} onChange={handleNameChange} />
           <div className="w-full flex flex-col justify-start items-start mb-3">
             <span className="mb-2">
               Title <span className="text-red-600">*</span>
diff --git a/frontend/web/src/components/CreateShortcutDrawer.tsx b/frontend/web/src/components/CreateShortcutDrawer.tsx
index 8e481bb..e10cd2f 100644
--- a/frontend/web/src/components/CreateShortcutDrawer.tsx
+++ b/frontend/web/src/components/CreateShortcutDrawer.tsx
@@ -20,7 +20,7 @@ import { useAppSelector } from "@/stores";
 import useLoading from "../hooks/useLoading";
 import { shortcutService } from "../services";
 import Icon from "./Icon";
-import ShortcutNameInput from "./ShortcutNameInput";
+import ResourceNameInput from "./ResourceNameInput";
 
 interface Props {
   shortcutId?: ShortcutId;
@@ -84,7 +84,7 @@ const CreateShortcutDrawer: React.FC<Props> = (props: Props) => {
   }, [shortcutId]);
 
   if (loadingState.isLoading) {
-    return;
+    return null;
   }
 
   const setPartialState = (partialState: Partial<State>) => {
@@ -222,7 +222,7 @@ const CreateShortcutDrawer: React.FC<Props> = (props: Props) => {
       <ModalClose />
       <DialogContent className="max-w-full sm:max-w-sm">
         <div className="overflow-y-auto w-full mt-2 px-3 pb-4">
-          <ShortcutNameInput name={state.shortcutCreate.name} onChange={handleNameChange} />
+          <ResourceNameInput name={state.shortcutCreate.name} onChange={handleNameChange} />
           <div className="w-full flex flex-col justify-start items-start mb-3">
             <span className="mb-2">
               Link <span className="text-red-600">*</span>
diff --git a/frontend/web/src/components/ShortcutNameInput.tsx b/frontend/web/src/components/ResourceNameInput.tsx
similarity index 85%
rename from frontend/web/src/components/ShortcutNameInput.tsx
rename to frontend/web/src/components/ResourceNameInput.tsx
index 9b88e4f..c77a572 100644
--- a/frontend/web/src/components/ShortcutNameInput.tsx
+++ b/frontend/web/src/components/ResourceNameInput.tsx
@@ -9,7 +9,7 @@ interface Props {
   onChange: (name: string) => void;
 }
 
-const ShortcutNameInput = (props: Props) => {
+const ResourceNameInput = (props: Props) => {
   const { name, onChange } = props;
   const [modified, setModified] = useState(false);
   const [editingName, setEditingName] = useState(name || generateRandomString().toLowerCase());
@@ -49,17 +49,11 @@ const ShortcutNameInput = (props: Props) => {
       </div>
       {modified && (
         <div className="relative w-full">
-          <Input
-            className="w-full"
-            type="text"
-            placeholder="An unique name for the shortcut"
-            value={editingName}
-            onChange={handleNameInputChange}
-          />
+          <Input className="w-full" type="text" placeholder="An unique name" value={editingName} onChange={handleNameInputChange} />
         </div>
       )}
     </div>
   );
 };
 
-export default ShortcutNameInput;
+export default ResourceNameInput;