diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84eecc658..3fd169135 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,8 @@ and this project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 - Standard builds now exclude non-en-US dictionary assets and download optional dictionaries dynamically.
 
 ### Fixed
+- **Text Edit mode no longer opens as a blank panel** when one-handed wrapper layout is active;
+  the wrapper now lays out the visible Text Edit/touchpad overlay instead of the hidden keyboard view.
 - **Sticky Shift from upstream handwriting cleanup** — upstream v3.8.6 stopped the hidden handwriting
   bottom row on every keyboard-frame switch, which globally cancelled the active Shift pointer before
   release. We keep the upstream handwriting feature but only stop handwriting when it is actually
diff --git a/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java b/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java
index bdb2b7f08..1060da20f 100644
--- a/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java
+++ b/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java
@@ -888,6 +888,10 @@ public View getVisibleKeyboardView() {
             return mClipboardHistoryView;
         } else if (isHandwritingShowing()) {
             return mHandwritingView;
+        } else if (mTouchpadView != null && mTouchpadView.isShown()) {
+            return mTouchpadView;
+        } else if (mTextEditView != null && mTextEditView.isShown()) {
+            return mTextEditView;
         }
         return mKeyboardView;
     }
diff --git a/fastlane/metadata/android/en-US/changelogs/4000.txt b/fastlane/metadata/android/en-US/changelogs/4000.txt
index 910f2974a..d502f6580 100644
--- a/fastlane/metadata/android/en-US/changelogs/4000.txt
+++ b/fastlane/metadata/android/en-US/changelogs/4000.txt
@@ -3,3 +3,4 @@ Offline AI now runs on-device GGUF models via llama.cpp, with adjustable samplin
 Richer touchpad gestures: word select, word-by-word navigation, clipboard, undo/redo, hold-to-backspace.
 Auto-read one-time codes from an incoming SMS as a tappable suggestion.
 Regex shortcuts in Text Expander.
+Text Edit mode no longer opens as a blank panel in one-handed layouts.