diff --git a/VoidLink/Input/OnScreenWidgetView.swift b/VoidLink/Input/OnScreenWidgetView.swift
index ced5cda9..acb5ca44 100644
--- a/VoidLink/Input/OnScreenWidgetView.swift
+++ b/VoidLink/Input/OnScreenWidgetView.swift
@@ -3729,7 +3729,7 @@ import ObjectiveC.runtime
                     widget.isUserInteractionEnabled = false
                     if ((folder.buttonMode != .slideAndHold && widget.widgetType == .touchPad)
                         || abs(widget.backgroundAlpha) < 0.1){
-                        widget.highlightBorder(highlighted: folder.animatesTransition, color: UIColor.systemBlue.cgColor)
+                        widget.highlightBorder(highlighted: OnScreenWidgetView.enableFolderAnimation && folder.animatesTransition, color: OnScreenWidgetView.enableFolderAnimation ? UIColor.systemBlue.cgColor : UIColor.clear.cgColor)
                     }
                     let duration = (OnScreenWidgetView.enableFolderAnimation && folder.animatesTransition)
                     ? (folder.buttonMode == .slideAndHold ? 0.05 : widget.standardFoldingInterval)
@@ -3758,7 +3758,7 @@ import ObjectiveC.runtime
                     widget.isHidden = false
                     if ((folder.buttonMode != .slideAndHold && widget.widgetType == .touchPad)
                         || abs(widget.backgroundAlpha) < 0.1){
-                        widget.highlightBorder(highlighted: folder.animatesTransition, color: UIColor.systemBlue.cgColor)
+                        widget.highlightBorder(highlighted: OnScreenWidgetView.enableFolderAnimation && folder.animatesTransition, color: OnScreenWidgetView.enableFolderAnimation ? UIColor.systemBlue.cgColor : UIColor.clear.cgColor)
                     }
                     UIView.animate(withDuration: (OnScreenWidgetView.enableFolderAnimation && folder.animatesTransition)
                                    ? (folder.buttonMode == .slideAndHold ? 0.05 : widget.standardFoldingInterval)
diff --git a/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift
index afe5508a..5ed2e87f 100644
--- a/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift
+++ b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift
@@ -1562,7 +1562,7 @@ final class LayoutOnScreenControlsViewController: UIViewController, OnScreenWidg
     }
 
     private func clearSickInput() {
-        if selectedWidget != nil && widgetViewSelected {
+        if selectedWidget != nil && widgetViewSelected && OnScreenWidgetView.gamepadArrivalReported {
             OnScreenControls.shared()?.clearLeftStickTouchPadFlag()
             OnScreenControls.shared()?.clearRightStickTouchPadFlag()
         }
diff --git a/VoidLinkPreview/WidgetPickerView.swift b/VoidLinkPreview/WidgetPickerView.swift
index 5ed5e48e..586d9339 100644
--- a/VoidLinkPreview/WidgetPickerView.swift
+++ b/VoidLinkPreview/WidgetPickerView.swift
@@ -357,7 +357,6 @@ private struct InteractiveTextField: UIViewRepresentable {
         if uiView.isEnabled != isEnabled {
             DispatchQueue.main.async {
                 uiView.isEnabled = isEnabled
-                uiView.isUserInteractionEnabled = isEnabled
             }
         }
         uiView.alpha = isEnabled ? 1.0 : 0.45
@@ -2462,7 +2461,7 @@ struct WidgetPickerView: View {
                         .zIndex(20)
                     }
                     
-                    //if true {
+                    if true {
                         createWidgetSection(title: LocalizationHelper.localizedString(forKey: "Manually enter press duration in milliseconds")) {
                             InteractiveTextField(
                                 placeholder: LocalizationHelper.localizedString(forKey: ""),
@@ -2472,7 +2471,7 @@ struct WidgetPickerView: View {
                             .frame(height: fieldHeight)
                         }
                         .zIndex(40)
-                    // }
+                    }
                 }
 
                 HStack(spacing: actionSpacing) {
diff --git a/moonlight-common/moonlight-common-c b/moonlight-common/moonlight-common-c
index 24c83a1a..ea507a13 160000
--- a/moonlight-common/moonlight-common-c
+++ b/moonlight-common/moonlight-common-c
@@ -1 +1 @@
-Subproject commit 24c83a1a3ba26aac072ff3aadba877ba6ae58920
+Subproject commit ea507a137dd8852d6c7b6bd2ede7e48f11cc9f1c