diff --git a/src/css/prosemirror.scss b/src/css/prosemirror.scss
index 344c2fa996d..6d995d169b8 100644
--- a/src/css/prosemirror.scss
+++ b/src/css/prosemirror.scss
@@ -336,18 +336,15 @@ div.ProseMirror {
 			border-left: 0;
 			vertical-align: top;
 			max-width: 100%;
-			line-height: var(--default-clickable-area);
 			&:first-child {
 				border-left: 1px solid var(--table-color-border);
 			}
 		}
 		td {
-			padding: 0 0 0 0.75em;
 			border-top: 0;
 			color: var(--color-main-text);
 		}
 		th {
-			padding: 0 0 0 0.75em;
 			font-weight: normal;
 			border-bottom-color: var(--table-color-heading-border);
 			color: var(--table-color-heading);
diff --git a/src/nodes/Table/TableCellView.vue b/src/nodes/Table/TableCellView.vue
index 057f84ee51a..61e57a0c02e 100644
--- a/src/nodes/Table/TableCellView.vue
+++ b/src/nodes/Table/TableCellView.vue
@@ -118,6 +118,7 @@ td {
 	.content {
 		flex: 1 1 0;
 		margin: 0;
+		padding: calc((var(--default-clickable-area) - var(--default-font-size) * 1.5) / 2) 0.75em;
 	}
 
 	.action-item {
diff --git a/src/nodes/Table/TableHeaderView.vue b/src/nodes/Table/TableHeaderView.vue
index c18a14cfc92..916d5509b2f 100644
--- a/src/nodes/Table/TableHeaderView.vue
+++ b/src/nodes/Table/TableHeaderView.vue
@@ -181,12 +181,17 @@ export default {
 </script>
 
 <style scoped lang="scss">
+div[contenteditable=true] th .content {
+	padding-right: 0;
+}
 th {
 
 	.content {
 		margin: 0;
 		flex-grow: 1;
+		padding: calc((var(--default-clickable-area) - var(--default-font-size) * 1.5) / 2) 0.75em;
 	}
+
 	.action-item {
 		opacity: 50%;
 	}