diff --git a/client/src/components/content-block-form/ContentElement.vue b/client/src/components/content-block-form/ContentElement.vue
index 625f9b29..06432b95 100644
--- a/client/src/components/content-block-form/ContentElement.vue
+++ b/client/src/components/content-block-form/ContentElement.vue
@@ -52,7 +52,7 @@
   const ImageForm = () => import(/* webpackChunkName: "content-forms" */'@/components/content-forms/ImageForm');
   const DocumentForm = () => import(/* webpackChunkName: "content-forms" */'@/components/content-forms/DocumentForm');
   const AssignmentForm = () => import(/* webpackChunkName: "content-forms" */'@/components/content-forms/AssignmentForm');
-  const TextForm = () => import(/* webpackChunkName: "content-forms" */'@/components/content-forms/TextForm');
+  const TextForm = () => import(/* webpackChunkName: "content-forms" */'@/components/content-forms/TipTap.vue');
   const SubtitleForm = () => import(/* webpackChunkName: "content-forms" */'@/components/content-forms/SubtitleForm');
 
   const CHOOSER = 'content-block-element-chooser-widget';
diff --git a/client/src/components/content-forms/TextForm.vue b/client/src/components/content-forms/TextForm.vue
index 30750b97..e8ec7762 100644
--- a/client/src/components/content-forms/TextForm.vue
+++ b/client/src/components/content-forms/TextForm.vue
@@ -1,161 +1,37 @@
 <template>
-  <!-- eslint-disable vue/no-v-html -->
   <div class="text-form">
-    <toggle
-      :checked="isList"
-      label="Liste"
-      @input="toggleList"
-    />
-
-    <tip-tap
-      :value="value.text"
-      @input="$emit('change-text', $event)"
+    <textarea
+      :value="text"
+      class="text-form__input skillbox-textarea"
+      data-cy="text-form-input"
+      placeholder="Text erfassen..."
+      @input="$emit('change-text', $event.target.value, index)"
     />
   </div>
 </template>
 
-<script lang="ts">
-  import Vue, {PropType} from "vue";
-  import Toggle from "@/components/ui/Toggle.vue";
-  import TipTap from "@/components/content-forms/TipTap.vue";
-
-  interface Value {
-    text: string;
-  }
-
-  interface Data {
-    localOnlyText: string,
-    textToStoreWhileFocused: string,
-    textBuffer: string, // text that gets saved, but not updated, when the user is typing
-    htmlBuffer: string, // same as above, but this is the html that's generated
-    isList: boolean,
-    // listHTML: string
-  }
-
-  const ul = /<\/?ul>/;
-  const li = /<\/?li>/;
-  const br = /<br(\/)?>/;
-  const div = /(<\/?)div(>)/g;
-  const anythingElse = /<(?!\/?(?:ul|li|p))\/?([^>]*)>/;
-
-  // the non-breaking space is used so the cursor is positioned inside the element by default. We remove it later
-  const nonBreakingSpace = '&nbsp;';
-  const emptyParagraph = `<p>${nonBreakingSpace}</p>`;
-  const emptyList = `<ul><li>${nonBreakingSpace}</li></ul>`;
-
-  export default Vue.extend({
+<script>
+  export default {
     props: {
       value: {
-        type: Object as PropType<Value>,
-        validator(value: Value) {
+        type: Object,
+        default: null,
+        validator(value) {
           return Object.prototype.hasOwnProperty.call(value, 'text');
-        },
+        }
       },
-    },
-    components: {TipTap, Toggle},
-
-    data(): Data {
-      return {
-        // this is the text that's tracked by the input field. It will not update every time the prop updates, otherwise we keep losing focus
-        localOnlyText: '',
-        // this is the variable that stores our text while the user is typing and also updates the outer value
-        textToStoreWhileFocused: '', // we need to have a text that always updates for user input
-        textBuffer: '',
-        htmlBuffer: '',
-        isList: false,
-//         listHTML: `<ul>
-// <li>Hello</li>
-// <li>World</li>
-// </ul>`
-      };
-    },
+      index: {
+        type: Number,
+        default: -1
+      }
+  },
 
     computed: {
-      text(): string {
-        // if has ul / li, return as is
-        if (this.isList) {
-          return this.value.text;
-        } else {
-          // need p tags
-          return this.value.text ? this.value.text.replace(/<br(\/)?>/, '\n').replace(/(<([^>]+)>)/ig, '') : emptyParagraph;
-        }
-      },
-      html(): string {
-        return this.value.text;
-      },
-    },
-
-    mounted() {
-      console.log('i was mounted now');
-      // sync this only once, when the component gets mounted
-      this.isList = ul.test(this.value.text);
-      console.log(this.text);
-      this.localOnlyText = this.text;
-      this.textBuffer = this.text;
-      this.htmlBuffer = this.text;
-      // when mounted, we also check if the text already contains some li or ul elements
-      // after loading, we use the local data property to determine if we want a list or now
-    },
-
-    methods: {
-      updateSomeText() {
-        console.log('htmlBuffer', this.htmlBuffer);
-        let newText = this.htmlBuffer.replace(div, '$1p$2')
-          .replace(nonBreakingSpace, '')
-          // .replace(br, '\n')
-          .replace(anythingElse, '');
-        if (newText === '') {
-          // if the new text would be empty, we replace it according to our needs
-          if (this.isList) {
-            newText = emptyList;
-          } else {
-           newText = emptyParagraph;
-          }
-        }
-        this.localOnlyText = newText;
-        console.log(newText);
-
-      },
-      toggleList(checked: boolean) {
-        console.log(checked);
-        if (checked) {
-          this.makeList();
-        } else {
-          this.localOnlyText = this.textBuffer;
-          this.isList = false;
-        }
-      },
-      makeList() {
-        // this.localOnlyText = this.localOnlyText
-        let sep = /\n+/;
-        let lines = this.textBuffer.split(sep);
-        let listItems = lines.reduce((previous, current) => {
-          return `${previous}<li>${current}</li>`;
-        }, '');
-        let list = `
-<ul>
-  ${listItems}
-</ul>`;
-        console.log(list);
-        this.localOnlyText = list;
-        this.isList = true;
-      },
-      changeSomeText(event: Event) {
-        const target = (<HTMLInputElement>event.target);
-        let newHtml = target.innerHTML;
-        let newText = target.innerText;
-        this.htmlBuffer = newHtml;
-        this.textBuffer = newText;
-        this.$emit('change-text', newHtml);
-      },
-      change(event: Event) {
-        const target = (<HTMLInputElement>event.target);
-        const newText = target.innerText;
-
-        this.$emit('change-text', newText);
-      },
-    },
-  });
+      text() {
+        return this.value.text ? this.value.text.replace(/<br(\/)?>/, '\n').replace(/(<([^>]+)>)/ig, '') : '';
+      }
+    }
+  };
 </script>
 
 <style scoped lang="scss">
@@ -165,26 +41,5 @@
     &__input {
       width: 100%;
     }
-
-    &__contenteditable {
-      width: 100%;
-      height: 300px;
-    }
-
-    /deep/ ul {
-      list-style: initial;
-    }
-
-    /deep/ li {
-      @include inputfont;
-    }
-
-    /deep/ div {
-      @include inputfont;
-    }
-
-    /deep/ p {
-      @include inputfont;
-    }
   }
 </style>
diff --git a/client/src/components/content-forms/TipTap.vue b/client/src/components/content-forms/TipTap.vue
index 87d73214..d03402e1 100644
--- a/client/src/components/content-forms/TipTap.vue
+++ b/client/src/components/content-forms/TipTap.vue
@@ -1,53 +1,70 @@
 <template>
   <div class="tip-tap">
-    <button @click="makeList">
-      List
-    </button>
+    <toggle
+      :bordered="false"
+      :checked="isList"
+      label="Als Liste formatieren"
+      @input="toggleList"
+    />
+
     <editor-content :editor="editor" />
   </div>
 </template>
 
 <script lang="ts">
-  import Vue from 'vue';
+  import Vue, {PropType} from 'vue';
   import {Editor, EditorContent} from "@tiptap/vue-2";
   import Document from '@tiptap/extension-document';
   import Paragraph from '@tiptap/extension-paragraph';
   import Text from '@tiptap/extension-text';
   import BulletList from '@tiptap/extension-bullet-list';
   import ListItem from '@tiptap/extension-list-item';
+  import Toggle from "@/components/ui/Toggle.vue";
 
   interface Data {
-    editor: Editor | null;
+    editor: Editor | undefined;
+  }
+  interface Value {
+    text: string;
   }
 
   export default Vue.extend({
-
     props: {
       value: {
-        type: String,
-        default: ''
-      }
+        type: Object as PropType<Value>,
+        validator(value: Value) {
+          return Object.prototype.hasOwnProperty.call(value, 'text');
+        },
+      },
     },
+
     components: {
+      Toggle,
       EditorContent
     },
 
     data(): Data {
       return {
-        editor: null,
+        editor: undefined,
       };
     },
 
+    computed: {
+      isList(): boolean {
+        return this.editor?.isActive('bulletList') || false;
+      }
+    },
+
     watch: {
-      value(newVal) {
+      value({text}: Value) {
         const editor = this.editor as Editor; // editor is always initialized on mount, cast it
-        const isSame = editor.getHTML() === newVal;
+        const isSame = editor.getHTML() === text;
 
         if (isSame) {
           return;
         }
 
-        editor.commands.setContent(newVal, false);
+        editor.commands.setContent(text, false);
       }
     },
 
@@ -68,7 +85,10 @@
           ListItem
         ],
         onUpdate: () => {
-          this.$emit('input', (<Editor>this.editor).getHTML());
+          const newValue = {
+            text:(<Editor>this.editor).getHTML()
+          };
+          this.$emit('input', newValue);
         }
       });
     },
@@ -78,10 +98,10 @@
     },
 
     methods: {
-      makeList() {
+      toggleList() {
         const editor = this.editor as Editor;
         editor.chain().selectAll().toggleBulletList().run();
-      }
+      },
     }
   });
 </script>
@@ -95,5 +115,21 @@
       @include inputstyle;
       flex-direction: column;
     }
+
+    /deep/ ul {
+      list-style: initial;
+    }
+
+    /deep/ li {
+      @include inputfont;
+    }
+
+    /deep/ div {
+      @include inputfont;
+    }
+
+    /deep/ p {
+      @include inputfont;
+    }
   }
 </style>