diff --git a/src/containers/AddPostForm.jsx b/src/containers/AddPostForm.jsx
index 7ed1e66b36c99836d065d4259662a075faa30a38..0503b95d6fa7109429a56c91ab69cfaad4cba246 100644
--- a/src/containers/AddPostForm.jsx
+++ b/src/containers/AddPostForm.jsx
@@ -10,7 +10,7 @@ import ErrorMessage from "components/ErrorMessage";
 import MarkdownEditor from "components/mde/MarkdownEditor";
 import { useActionState } from "hooks";
 
-const AddPostForm = ({ className }) => {
+const AddPostForm = ({ className, canAddProposal }) => {
   const cardRef = useRef();
   const editorRef = useRef();
   const [expanded, setExpanded] = useState(false);
@@ -34,16 +34,24 @@ const AddPostForm = ({ className }) => {
     setExpanded(false);
   }, [setExpanded]);
 
-  const onWrite = useCallback(() => {
-    if (!expanded) {
-      setExpanded(true);
-      setTimeout(() => {
-        if (editorRef.current && editorRef.current.finalRefs.textarea.current) {
-          editorRef.current.finalRefs.textarea.current.focus();
-        }
-      }, 0);
-    }
-  }, [setExpanded, expanded]);
+  const onWrite = useCallback(
+    (evt) => {
+      setShowAddConfirm(false);
+
+      if (!expanded) {
+        setExpanded(true);
+        setTimeout(() => {
+          if (
+            editorRef.current &&
+            editorRef.current.finalRefs.textarea.current
+          ) {
+            editorRef.current.finalRefs.textarea.current.focus();
+          }
+        }, 0);
+      }
+    },
+    [setExpanded, expanded, setShowAddConfirm]
+  );
 
   const hideAddConfirm = useCallback(() => {
     setShowAddConfirm(false);
@@ -88,7 +96,7 @@ const AddPostForm = ({ className }) => {
     className,
     "hover:elevation-16 transition duration-500",
     {
-      "elevation-4 cursor-text": !expanded,
+      "elevation-4 cursor-text": !expanded && !showAddConfirm,
       "lg:elevation-16 container-padding--zero lg:container-padding--auto": expanded,
     }
   );
@@ -146,39 +154,41 @@ const AddPostForm = ({ className }) => {
             ]}
           />
 
-          <div
-            className="form-field"
-            onChange={(evt) => setType(evt.target.value)}
-          >
-            <div className="form-field__wrapper form-field__wrapper--freeform flex-col sm:flex-row">
-              <div className="radio form-field__control">
-                <label>
-                  <input
-                    type="radio"
-                    name="postType"
-                    value="post"
-                    defaultChecked
-                  />
-                  <span className="text-sm sm:text-base">
-                    Přidávám <strong>běžný příspěvek</strong>
-                  </span>
-                </label>
-              </div>
-
-              <div className="radio form-field__control ml-0 mt-4 sm:mt-0 sm:ml-4">
-                <label>
-                  <input
-                    type="radio"
-                    name="postType"
-                    value="procedure-proposal"
-                  />
-                  <span className="text-sm sm:text-base">
-                    Přidávám <strong>návrh postupu</strong>
-                  </span>
-                </label>
+          {canAddProposal && (
+            <div
+              className="form-field"
+              onChange={(evt) => setType(evt.target.value)}
+            >
+              <div className="form-field__wrapper form-field__wrapper--freeform flex-col sm:flex-row">
+                <div className="radio form-field__control">
+                  <label>
+                    <input
+                      type="radio"
+                      name="postType"
+                      value="post"
+                      defaultChecked
+                    />
+                    <span className="text-sm sm:text-base">
+                      Přidávám <strong>běžný příspěvek</strong>
+                    </span>
+                  </label>
+                </div>
+
+                <div className="radio form-field__control ml-0 mt-4 sm:mt-0 sm:ml-4">
+                  <label>
+                    <input
+                      type="radio"
+                      name="postType"
+                      value="procedure-proposal"
+                    />
+                    <span className="text-sm sm:text-base">
+                      Přidávám <strong>návrh postupu</strong>
+                    </span>
+                  </label>
+                </div>
               </div>
             </div>
-          </div>
+          )}
 
           {type === "procedure-proposal" && (
             <p className="alert alert--light text-sm">
diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx
index 8918b1ec97d89d2e2ad356bed1d3c3cf6e136415..a2cdcbf900d27f9666c37e24aa16d34aad4582a6 100644
--- a/src/pages/Home.jsx
+++ b/src/pages/Home.jsx
@@ -330,7 +330,7 @@ const Home = () => {
           )}
           {programEntry.discussionOpened &&
             isAuthenticated &&
-            !user.isBanned && <AddPostForm className="mb-8" />}
+            !user.isBanned && <AddPostForm className="mb-8" canAddProposal={user.role === "member" || user.role === "chairman"} />}
 
           <PostsContainer
             className="container-padding--zero lg:container-padding--auto"