diff --git a/src/client/.idea/git_toolbox_prj.xml b/src/client/.idea/git_toolbox_prj.xml
new file mode 100644
index 0000000..b382006
--- /dev/null
+++ b/src/client/.idea/git_toolbox_prj.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationConfigOverride">
+      <CommitMessageValidationOverride>
+        <option name="enabled" value="true" />
+      </CommitMessageValidationOverride>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/client/src/components/todos/collapsed/todoShortForm.tsx b/src/client/src/components/todos/collapsed/todoShortForm.tsx
index d301312..00d3f0d 100644
--- a/src/client/src/components/todos/collapsed/todoShortForm.tsx
+++ b/src/client/src/components/todos/collapsed/todoShortForm.tsx
@@ -35,6 +35,12 @@ export const TodoShortForm = (props: {
         />
       </div>
       <div className="flex flex-row pb-1">
+        <AddProjectButton
+          onProjectChanged={props.onProjectChanged}
+          initialProject={props.project}
+        >
+          {props.project}
+        </AddProjectButton>
         <AddProjectButton
           onProjectChanged={props.onProjectChanged}
           initialProject={props.project}
diff --git a/src/client/src/pages/index.tsx b/src/client/src/pages/index.tsx
index 91350c2..d52a749 100644
--- a/src/client/src/pages/index.tsx
+++ b/src/client/src/pages/index.tsx
@@ -10,7 +10,7 @@ const HomePage = () => {
   const { data, isLoading } = todosApi.useGetActiveTodosQuery();
 
   const onlyActiveTodos = useMemo(
-    () => data.filter((t) => t.status === false),
+    () => data?.filter((t) => t.status === false),
     [data]
   );
   const groupedTodos = useMemo(