diff --git a/src/App.js b/src/App.js
index 5658916..851fbb4 100644
--- a/src/App.js
+++ b/src/App.js
@@ -64,12 +64,11 @@ const App = () => {
         <div className="app">
             <button className="logout" onClick={() => keycloak.logout()}>Logout</button>
             <h1>SWA - Jodel</h1>
-            {!selectedPost && (
-                <div>
+
+                <div style={{height: selectedPost?0:"auto", overflowY: "hidden"}}>
                     <NewPostForm addPost={addPost}/>
                     {posts.map(post => <Post key={post.id} post={post} recursionDepth={5} selectPost={selectPost} reload={reload} />)}
                 </div>
-            )}
             {selectedPost && (
                 <div className="single-post-view">
                     <div className="close-post">
@@ -94,7 +93,7 @@ const App = () => {
                         <button type="submit">Kommentieren</button>
                     </form>
                     <div className="comments">
-                        {selectedPost.comments.map(post => <Post key={selectedPost.id} post={post} recursionDepth={0} selectPost={null} reload={reload} />)}
+                        {selectedPost.comments.map(post => <Post key={post.id} post={post} recursionDepth={0} selectPost={null} reload={reload} />)}
                     </div>
                 </div>
             )}
diff --git a/src/components/Post.js b/src/components/Post.js
index 94ed370..ab2e1d6 100644
--- a/src/components/Post.js
+++ b/src/components/Post.js
@@ -42,7 +42,7 @@ const Post = ({ post, recursionDepth, selectPost, reload }) => {
 
     return (
         <div>
-            <div className="post" onClick={() => setShowComments(!showComments)}>
+            <div className="post" onClick={click => {if (!(click.target instanceof HTMLButtonElement)) setShowComments(!showComments)}}>
                 <div className="post-container">
                     {post.id === post.parent && <div className="post-title">
                         <h3>{post.title}</h3>