diff --git a/webapp/components/Comment/Comment.story.js b/webapp/components/Comment/Comment.story.js
new file mode 100644
index 000000000..291b6cb11
--- /dev/null
+++ b/webapp/components/Comment/Comment.story.js
@@ -0,0 +1,54 @@
+import { storiesOf } from '@storybook/vue'
+import { withA11y } from '@storybook/addon-a11y'
+import Comment from './Comment'
+import helpers from '~/storybook/helpers'
+
+helpers.init()
+
+const comment = {
+  id: '5d42a2277f2725002a449cb3',
+  content:
+    '<p></p><p>Thank you all!</p><p><a href="/profile/5ab6a050896325000a59e514" target="_blank">@wolfgang-huss</a> <a href="/profile/5b1693daf850c11207fa6109" target="_blank">@robert-schafer</a> <a href="/profile/5a663b1ac64291000bf302a1" target="_blank">@greg</a> <a href="/profile/5acc8a337c6b11000b3c7612" target="_blank">@human-connection</a></p><p>watch my video</p><p><a href="https://www.youtube.com/watch?v=EeVspZ8jC6I" class="embed" target="_blank"></a></p><p></p><p>I think we can all learn a lot from Alex\'s video :) </p><p>It\'s really great stuff!!</p><p>Please give him a big smiley face emoticon :D</p>',
+  contentExcerpt:
+    '<p></p><p>Thank you all!</p><p><a href="/profile/5ab6a050896325000a59e514" target="_blank">@wolfgang-huss</a> <a href="/profile/5b1693daf850c11207fa6109" target="_blank">@robert-schafer</a> <a href="/profile/5a663b1ac64291000bf302a1" target="_blank">@greg</a> <a href="/profile/5acc8a337c6b11000b3c7612" target="_blank">@human-connection</a></p><p>watch my video</p><p><a href="https://www.youtube.com/watch?v=EeVspZ8jC6I" target="_blank"></a></p><p></p><p>I think we can all learn a lot from Alex\'s video :) </p><p>It\'s really great stuff!!</p><p>Please give him a …</p>',
+  createdAt: '2019-08-01T08:26:15.839Z',
+  updatedAt: '2019-08-01T08:26:15.839Z',
+  deleted: false,
+  disabled: false,
+  author: {
+    id: '1',
+    avatar:
+      'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
+    slug: 'jenny-rostock',
+    name: 'Rainer Unsinn',
+    disabled: false,
+    deleted: false,
+    contributionsCount: 25,
+    shoutedCount: 5,
+    commentedCount: 39,
+    followedByCount: 2,
+    followedByCurrentUser: true,
+    location: null,
+    badges: [
+      {
+        id: 'indiegogo_en_bear',
+        icon: '/img/badges/indiegogo_en_bear.svg',
+        __typename: 'Badge',
+      },
+    ],
+    __typename: 'User',
+  },
+  __typename: 'Comment',
+}
+
+storiesOf('Comment', module)
+  .addDecorator(withA11y)
+  .addDecorator(helpers.layout)
+  .add('Basic comment', () => ({
+    components: { Comment },
+    store: helpers.store,
+    data: () => ({
+      comment,
+    }),
+    template: `<comment :key="comment.id" :comment="comment" />`,
+  }))
diff --git a/webapp/components/Comment.vue b/webapp/components/Comment/Comment.vue
similarity index 95%
rename from webapp/components/Comment.vue
rename to webapp/components/Comment/Comment.vue
index 2cebde0b6..a1bd7dd34 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment/Comment.vue
@@ -11,7 +11,7 @@
   </div>
   <div v-else :class="{ comment: true, 'disabled-content': comment.deleted || comment.disabled }">
     <ds-card :id="`commentId-${comment.id}`">
-      <ds-space margin-bottom="small">
+      <ds-space margin-bottom="small" margin-top="base">
         <hc-user :user="author" :date-time="comment.createdAt" />
         <!-- Content Menu (can open Modals) -->
         <client-only>
@@ -21,7 +21,7 @@
             resource-type="comment"
             :resource="comment"
             :modalsData="menuModalsData"
-            style="float-right"
+            class="float-right"
             :is-owner="isAuthor(author.id)"
             @showEditCommentMenu="editCommentMenu"
           />
@@ -34,6 +34,7 @@
           :comment="comment"
           @showEditCommentMenu="editCommentMenu"
           @updateComment="updateComment"
+          @collapse="isCollapsed = true"
         />
       </div>
       <div v-show="!openEditCommentMenu">
@@ -61,7 +62,7 @@
         />
         <div class="show-more-or-less-div">
           <span class="show-more-or-less">
-            <a v-if="!isCollapsed" @click="isCollapsed = !isCollapsed" class="padding-left">
+            <a v-if="!isCollapsed" class="padding-left" @click="isCollapsed = !isCollapsed">
               {{ $t('comment.show.less') }}
             </a>
           </span>
@@ -168,6 +169,10 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.float-right {
+  float: right;
+}
+
 .padding-left {
   padding-left: 40px;
 }
diff --git a/webapp/components/CommentForm/CommentForm.vue b/webapp/components/CommentForm/CommentForm.vue
index 6f1c7d931..6cdd08af3 100644
--- a/webapp/components/CommentForm/CommentForm.vue
+++ b/webapp/components/CommentForm/CommentForm.vue
@@ -123,6 +123,7 @@ export default {
               data: { UpdateComment },
             } = res
             this.$emit('updateComment', UpdateComment)
+            this.$emit('collapse')
             this.$toast.success(this.$t('post.comment.updated'))
             this.disabled = false
             this.closeEditWindow()
diff --git a/webapp/components/CommentList/CommentList.vue b/webapp/components/CommentList/CommentList.vue
index b3caf9009..6061847d7 100644
--- a/webapp/components/CommentList/CommentList.vue
+++ b/webapp/components/CommentList/CommentList.vue
@@ -29,7 +29,7 @@
   </div>
 </template>
 <script>
-import Comment from '~/components/Comment.vue'
+import Comment from '~/components/Comment/Comment'
 
 export default {
   components: {
diff --git a/webapp/storybook/helpers.js b/webapp/storybook/helpers.js
index 6a479034f..790a10f78 100644
--- a/webapp/storybook/helpers.js
+++ b/webapp/storybook/helpers.js
@@ -31,7 +31,7 @@ const helpers = {
             return false
           },
           user(state) {
-            return { id: 1, name: 'admin' }
+            return { id: '1', name: 'admin' }
           },
         },
       },
@@ -39,7 +39,7 @@ const helpers = {
         namespaced: true,
         getters: {
           placeholder(state) {
-            return 'Leave your inspirational thoughts...'
+            return 'Leave your inspirational thoughts ...'
           },
         },
       },