diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a48ed36..8fd8fdf 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -19,8 +19,8 @@ android {
         applicationId = "solutions.tretter.githugandroid"
         minSdk = 26
         targetSdk = 35
-        versionCode = 139
-        versionName = "0.1.138"
+        versionCode = 140
+        versionName = "0.1.139"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/solutions/tretter/githugandroid/Panes.kt b/app/src/main/java/solutions/tretter/githugandroid/Panes.kt
index a5383b4..91e0bfc 100644
--- a/app/src/main/java/solutions/tretter/githugandroid/Panes.kt
+++ b/app/src/main/java/solutions/tretter/githugandroid/Panes.kt
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentHeight
@@ -35,7 +34,9 @@ fun PaneWorkspace(
     terminalContent: @Composable () -> Unit,
 ) {
     Column(
-        modifier = modifier.fillMaxSize(),
+        modifier = modifier
+            .fillMaxWidth()
+            .wrapContentHeight(),
         verticalArrangement = Arrangement.spacedBy(0.dp),
     ) {
         paneLayout.order.forEachIndexed { index, paneId ->
@@ -89,7 +90,11 @@ private fun PaneCard(
         colors = CardDefaults.cardColors(containerColor = PanelSecondary),
         shape = RoundedCornerShape(16.dp),
     ) {
-        Column(modifier = Modifier.fillMaxSize()) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .wrapContentHeight(),
+        ) {
             PaneHeader(
                 paneId = paneId,
                 collapsed = false,
@@ -101,7 +106,8 @@ private fun PaneCard(
             )
             Box(
                 modifier = Modifier
-                    .fillMaxSize()
+                    .fillMaxWidth()
+                    .wrapContentHeight()
                     .padding(horizontal = 12.dp, vertical = 10.dp),
             ) {
                 content()
diff --git a/app/src/main/java/solutions/tretter/githugandroid/Terminal.kt b/app/src/main/java/solutions/tretter/githugandroid/Terminal.kt
index 1dbe1ae..35fa6c9 100644
--- a/app/src/main/java/solutions/tretter/githugandroid/Terminal.kt
+++ b/app/src/main/java/solutions/tretter/githugandroid/Terminal.kt
@@ -9,14 +9,13 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
@@ -110,13 +109,14 @@ fun TerminalPane(
 
     Box(
         modifier = Modifier
-            .fillMaxSize()
+            .fillMaxWidth()
+            .wrapContentHeight()
             .background(TerminalBackground, RoundedCornerShape(12.dp))
             .padding(8.dp)
     ) {
         Column(
             modifier = Modifier
-                .fillMaxHeight()
+                .fillMaxWidth()
                 .widthIn(min = terminalMinWidth),
             verticalArrangement = Arrangement.spacedBy(8.dp),
         ) {