diff --git a/.changeset/gentle-canyon.md b/.changeset/gentle-canyon.md
new file mode 100644
index 00000000000..863dfb8c229
--- /dev/null
+++ b/.changeset/gentle-canyon.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Prevent the JetBrains session scrollbar from covering transcript content.
diff --git a/.changeset/stellar-wolf.md b/.changeset/stellar-wolf.md
new file mode 100644
index 00000000000..5248ade0cf4
--- /dev/null
+++ b/.changeset/stellar-wolf.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": patch
+---
+
+Improve mouse wheel scrolling speed in the JetBrains session view.
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/SessionMessageListPanel.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/SessionMessageListPanel.kt
index d2506bb67b0..ec87a14abe7 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/SessionMessageListPanel.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/SessionMessageListPanel.kt
@@ -57,7 +57,7 @@ class SessionMessageListPanel(
         SessionUiStyle.SessionLayout.TRANSCRIPT_PADDING,
         SessionUiStyle.SessionLayout.TRANSCRIPT_PADDING,
         SessionUiStyle.SessionLayout.TRANSCRIPT_PADDING,
-        SessionUiStyle.SessionLayout.TRANSCRIPT_PADDING,
+        SessionUiStyle.SessionLayout.TRANSCRIPT_PADDING + SessionUiStyle.SessionLayout.TRANSCRIPT_SCROLLBAR_PADDING,
     ),
 ), Disposable, SessionEditorStyleTarget {
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt
index 83fc0fa2006..3befb98eb55 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/style/SessionUiStyle.kt
@@ -13,8 +13,9 @@ object SessionUiStyle {
     object SessionLayout {
         const val GAP = 4
         const val TRANSCRIPT_PADDING = 12
+        const val TRANSCRIPT_SCROLLBAR_PADDING = 10
         const val USER_PROMPT_INDENT = 100
-        const val SCROLL_INCREMENT = 16
+        const val SCROLL_INCREMENT = 48
     }
 
     /** Shared tokens for individual transcript views and session views. */
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionScrollTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionScrollTest.kt
index a5c6fbcacd3..3422c423fde 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionScrollTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/SessionScrollTest.kt
@@ -1,6 +1,7 @@
 package ai.kilocode.client.session
 
 import ai.kilocode.client.session.ui.SessionMessageListPanel
+import ai.kilocode.client.session.ui.style.SessionUiStyle
 import ai.kilocode.rpc.dto.ChatEventDto
 import ai.kilocode.rpc.dto.MessageErrorDto
 import ai.kilocode.rpc.dto.PermissionRequestDto
@@ -12,11 +13,14 @@ import ai.kilocode.rpc.dto.ToolRefDto
 import ai.kilocode.client.session.ui.prompt.PromptPanel
 import ai.kilocode.client.plugin.KiloBundle
 import com.intellij.ui.EditorTextField
+import com.intellij.ui.components.JBScrollPane
 import com.intellij.ui.components.JBRadioButton
 import com.intellij.util.ui.JBUI
 import java.awt.Container
 import javax.swing.AbstractButton
 import javax.swing.JButton
+import javax.swing.Scrollable
+import javax.swing.SwingConstants
 import javax.swing.JTextArea
 import kotlinx.coroutines.CompletableDeferred
 
@@ -161,6 +165,22 @@ class SessionScrollTest : SessionUiTestBase() {
         assertFalse(jumpButton().isVisible)
     }
 
+    fun `test physical mouse wheel uses accelerated transcript unit distance`() {
+        showMessages()
+        fillTranscript(48)
+        val bar = scrollBar()
+        setValue(bar, 0)
+        drainScroll()
+        val amount = 3
+        val expected = JBUI.scale(SessionUiStyle.SessionLayout.SCROLL_INCREMENT * amount)
+        assertTrue("bottom=${bottom(bar)} expected=$expected", bottom(bar) >= expected * 2)
+
+        val view = scrollView() as Scrollable
+        val unit = view.getScrollableUnitIncrement(scrollComponent().visibleRect, SwingConstants.VERTICAL, 1)
+
+        assertEquals(expected, unit * amount)
+    }
+
     fun `test part delta follows bottom after height growth`() {
         showMessages()
         fillTranscript(24)
@@ -476,11 +496,12 @@ class SessionScrollTest : SessionUiTestBase() {
         assertBottom(scrollBar())
     }
 
-    fun `test scroll owns the session viewport`() {
+    fun `test scroll owns the session viewport without overlapping content`() {
         settle()
 
         assertSame(scrollComponent(), scrollView()?.parent?.parent)
         assertFalse(scrollView() is SessionMessageListPanel)
+        assertFalse((scrollComponent() as JBScrollPane).isOverlappingScrollBar)
     }
 
     // ------ question/login-required autoscroll ------