diff --git a/src/components/misc/modal.vue b/src/components/misc/modal.vue
index b7f968942..2bbd063b6 100644
--- a/src/components/misc/modal.vue
+++ b/src/components/misc/modal.vue
@@ -195,10 +195,9 @@ $modal-width: 1024px;
 }
 
 .close {
-	$close-button-min-space: 84px;
 	$close-button-padding: 26px;
 	position: fixed;
-	top: 5px;
+	top: .5rem;
 	right: $close-button-padding;
 	color: var(--grey-900);
 	font-size: 2rem;
@@ -213,6 +212,10 @@ $modal-width: 1024px;
 	@media screen and (min-width: calc(#{$desktop	} + #{$close-button-min-space})) {
 		color: var(--white);
 	}
+
+	@media screen and (min-width: $tablet) and (max-width: #{$desktop + $close-button-min-space}) {
+		top: .75rem;
+	}
 }
 </style>
 
diff --git a/src/components/tasks/partials/heading.vue b/src/components/tasks/partials/heading.vue
index 53829db0e..78abca40c 100644
--- a/src/components/tasks/partials/heading.vue
+++ b/src/components/tasks/partials/heading.vue
@@ -113,7 +113,7 @@ async function save(title: string) {
 <style lang="scss" scoped>
 .heading {
 	display: flex;
-	justify-content: space-between;
+	justify-content: flex-start;
 	text-transform: none;
 	align-items: center;
 
@@ -134,6 +134,10 @@ async function save(title: string) {
 	@media screen and (max-width: $tablet) {
 		margin: 0 -.3rem .5rem -.3rem; // the title has 0.3rem padding - this make the text inside of it align with the rest
 	}
+
+	@media screen and (min-width: $tablet) and (max-width: #{$desktop + $close-button-min-space}) {
+		width: calc(100% - 6.5rem);
+	}
 }
 
 .title.task-id {
diff --git a/src/styles/common-imports.scss b/src/styles/common-imports.scss
index 82e596f69..f48fd87a1 100644
--- a/src/styles/common-imports.scss
+++ b/src/styles/common-imports.scss
@@ -37,3 +37,5 @@ $navbar-padding: 2rem;
 
 $vikunja-nav-color: var(--grey-700);
 $vikunja-nav-selected-width: 0.4rem;
+
+$close-button-min-space: 84px;