diff --git a/org.signal.Signal.yaml b/org.signal.Signal.yaml
index eb3876f..0217138 100644
--- a/org.signal.Signal.yaml
+++ b/org.signal.Signal.yaml
@@ -10,7 +10,7 @@ finish-args:
   # X11 performance
   - --share=ipc
   # We need X11
-  - --socket=x11
+  - --socket=fallback-x11
   # Access to wayland
   - --socket=wayland
   # Audio Access
diff --git a/signal-desktop.sh b/signal-desktop.sh
index 52a1190..6e36544 100644
--- a/signal-desktop.sh
+++ b/signal-desktop.sh
@@ -53,6 +53,10 @@ if ((${SIGNAL_USE_WAYLAND:-0})); then
     export ELECTRON_OZONE_PLATFORM_HINT="${ELECTRON_OZONE_PLATFORM_HINT:-auto}"
 fi
 
+if [[ "${ELECTRON_OZONE_PLATFORM_HINT}" == "auto" ]]; then
+    EXTRA_ARGS+=("--enable-wayland-ime" "--wayland-text-input-version=3")
+fi
+
 declare -r SIGNAL_PASSWORD_STORE="${SIGNAL_PASSWORD_STORE:-basic}"
 
 case "${SIGNAL_PASSWORD_STORE}" in