diff --git a/src/modules/modals/CreateRow.vue b/src/modules/modals/CreateRow.vue
index 7fa4ac8317..9ec2b8e1eb 100644
--- a/src/modules/modals/CreateRow.vue
+++ b/src/modules/modals/CreateRow.vue
@@ -5,6 +5,7 @@
 <template>
 	<NcDialog v-if="showModal"
 		:name="t('tables', 'Create row')"
+		size="large"
 		data-cy="createRowModal"
 		@closing="actionCancel">
 		<div class="modal__content" @keydown="onKeydown">
@@ -168,12 +169,6 @@ export default {
 		justify-content: end;
 	}
 
-	:where(.fix-col-1.end) {
-		display: inline-block;
-		position: relative;
-		left: 65%;
-	}
-
 	:where(.slot.fix-col-2) {
 		min-width: 50%;
 	}
diff --git a/src/modules/modals/EditRow.vue b/src/modules/modals/EditRow.vue
index cb640b87f3..6408c14432 100644
--- a/src/modules/modals/EditRow.vue
+++ b/src/modules/modals/EditRow.vue
@@ -6,6 +6,7 @@
 	<NcDialog v-if="showModal"
 		data-cy="editRowModal"
 		:name="t('tables', 'Edit row')"
+		size="large"
 		@closing="actionCancel">
 		<div class="modal__content" @keydown="onKeydown">
 			<div v-for="column in nonMetaColumns" :key="column.id">
diff --git a/src/shared/components/ncTable/partials/rowTypePartials/RowFormWrapper.vue b/src/shared/components/ncTable/partials/rowTypePartials/RowFormWrapper.vue
index a49bc541d7..9ffba6eaf8 100644
--- a/src/shared/components/ncTable/partials/rowTypePartials/RowFormWrapper.vue
+++ b/src/shared/components/ncTable/partials/rowTypePartials/RowFormWrapper.vue
@@ -91,7 +91,11 @@ export default {
 }
 
 pre {
-	white-space: pre;
+	white-space: pre-wrap;
+	white-space: -moz-pre-wrap;
+	white-space: -pre-wrap;
+	white-space: -o-pre-wrap;
+	word-wrap: break-word;
 }
 
 </style>