diff --git a/src/process.cpp b/src/process.cpp
index 892a1ff1..7acac37e 100644
--- a/src/process.cpp
+++ b/src/process.cpp
@@ -218,6 +218,16 @@ namespace proc {
       display_device::revert_configuration();
     });
 
+    if (!app.gamepad.empty()) {
+      _saved_input_config = std::make_shared<config::input_t>(config::input);
+      if (app.gamepad == "disabled") {
+        config::input.controller = false;
+      } else {
+        config::input.controller = true;
+        config::input.gamepad = app.gamepad;
+      }
+    }
+
 #ifdef _WIN32
     if (
       config::video.headless_mode        // Headless mode
@@ -671,6 +681,11 @@ namespace proc {
     virtual_display = false;
     allow_client_commands = false;
 
+    if (_saved_input_config) {
+      config::input = *_saved_input_config;
+      _saved_input_config.reset();
+    }
+
     if (needs_refresh) {
       refresh(config::stream.file_apps, false);
     }
@@ -1193,6 +1208,7 @@ namespace proc {
           ctx.use_app_identity = app_node.value("use-app-identity", false);
           ctx.per_client_app_identity = app_node.value("per-client-app-identity", false);
           ctx.allow_client_commands = app_node.value("allow-client-commands", true);
+          ctx.gamepad = app_node.value("gamepad", "");
 
           // Calculate a unique application id.
           auto possible_ids = calculate_app_id(name, ctx.image_path, i++);
diff --git a/src/process.h b/src/process.h
index ba3e3937..8d430a96 100644
--- a/src/process.h
+++ b/src/process.h
@@ -78,6 +78,7 @@ namespace proc {
     std::string output;
     std::string image_path;
     std::string id;
+    std::string gamepad;
     bool elevated;
     bool auto_detach;
     bool wait_all;
@@ -136,6 +137,7 @@ namespace proc {
     boost::process::v1::environment _env;
 
     std::shared_ptr<rtsp_stream::launch_session_t> _launch_session;
+    std::shared_ptr<config::input_t> _saved_input_config;
 
     std::vector<ctx_t> _apps;
     ctx_t _app;
diff --git a/src/rtsp.h b/src/rtsp.h
index 57791f21..76eb76a1 100644
--- a/src/rtsp.h
+++ b/src/rtsp.h
@@ -44,7 +44,6 @@ namespace rtsp_stream {
     int height;
     int fps;
     int gcmap;
-    int appid;
     int surround_info;
     std::string surround_params;
     bool enable_hdr;
diff --git a/src_assets/common/assets/web/apps.html b/src_assets/common/assets/web/apps.html
index b4ad7c72..8b35f789 100644
--- a/src_assets/common/assets/web/apps.html
+++ b/src_assets/common/assets/web/apps.html
@@ -164,12 +164,36 @@
           </div>
           <div id="appNameHelp" class="form-text">{{ $t('apps.app_name_desc') }}</div>
         </div>
+        <!-- Application Image -->
         <div class="mb-3">
           <label for="appImagePath" class="form-label">{{ $t('apps.image') }}</label>
           <input type="text" class="form-control monospace" id="appImagePath" aria-describedby="appImagePathHelp"
             v-model="editForm['image-path']" />
           <div id="appImagePathHelp" class="form-text">{{ $t('apps.image_desc') }}</div>
         </div>
+        <!-- gamepad override -->
+        <div class="mb-3" v-if="platform !== 'macos'">
+          <label for="gamepad" class="form-label">{{ $t('config.gamepad') }}</label>
+          <select id="gamepad" class="form-select" v-model="editForm.gamepad">
+            <option value="">{{ $t('_common.default_global') }}</option>
+            <option value="disabled">{{ $t('_common.disabled') }}</option>
+            <option value="auto">{{ $t('_common.auto') }}</option>
+
+            <Platformlayout :platform="platform">
+              <template #linux>
+                <option value="ds5">{{ $t("config.gamepad_ds5") }}</option>
+                <option value="switch">{{ $t("config.gamepad_switch") }}</option>
+                <option value="xone">{{ $t("config.gamepad_xone") }}</option>
+              </template>
+
+              <template #windows>
+                <option value="ds4">{{ $t('config.gamepad_ds4') }}</option>
+                <option value="x360">{{ $t('config.gamepad_x360') }}</option>
+              </template>
+            </Platformlayout>
+          </select>
+          <div class="form-text">{{ $t('config.gamepad_desc') }}</div>
+        </div>
         <!-- allow client commands -->
         <Checkbox class="mb-3"
                   id="clientCommands"
@@ -301,6 +325,13 @@
                   v-model="editForm['wait-all']"
                   default="true"
         ></Checkbox>
+        <!-- exit timeout -->
+        <div class="mb-3">
+          <label for="exitTimeout" class="form-label">{{ $t('apps.exit_timeout') }}</label>
+          <input type="number" class="form-control monospace" id="exitTimeout" aria-describedby="exitTimeoutHelp"
+                 v-model="editForm['exit-timeout']" min="0" placeholder="5" />
+          <div id="exitTimeoutHelp" class="form-text">{{ $t('apps.exit_timeout_desc') }}</div>
+        </div>
         <!-- use virtual display -->
         <Checkbox class="mb-3"
                   id="virtualDisplay"
@@ -317,7 +348,7 @@
                   v-model="editForm['use-app-identity']"
                   default="false"
         ></Checkbox>
-        <!-- use app identity -->
+        <!-- per-client app identity -->
         <Checkbox class="mb-3"
                   v-if="editForm['use-app-identity']"
                   id="perClientAppIdentity"
@@ -332,13 +363,6 @@
           <input type="range" step="1" min="20" max="200" class="form-range" id="resolutionScaleFactor" v-model="editForm['scale-factor']"/>
           <div class="form-text">{{ $t('apps.resolution_scale_factor_desc') }}</div>
         </div>
-        <!-- exit timeout -->
-        <div class="mb-3">
-          <label for="exitTimeout" class="form-label">{{ $t('apps.exit_timeout') }}</label>
-          <input type="number" class="form-control monospace" id="exitTimeout" aria-describedby="exitTimeoutHelp"
-                 v-model="editForm['exit-timeout']" min="0" placeholder="5" />
-          <div id="exitTimeoutHelp" class="form-text">{{ $t('apps.exit_timeout_desc') }}</div>
-        </div>
         <div class="env-hint alert alert-info overflow-auto">
           <div class="form-text">
             <h4>{{ $t('apps.env_vars_about') }}</h4>
@@ -407,15 +431,23 @@
             <i class="fa-solid fa-xl fa-circle-info"></i> {{ $t('apps.env_sunshine_compatibility') }}
           </div>
 
-          <div class="form-text" v-if="platform === 'windows'"><b>{{ $t('apps.env_rtss_cli_example') }}</b>
-            <pre>cmd /C \path\to\rtss-cli.exe limit:set %APOLLO_CLIENT_FPS%</pre>
-          </div>
-          <div class="form-text" v-else-if="platform === 'linux'"><b>{{ $t('apps.env_xrandr_example') }}</b>
-            <pre>sh -c "xrandr --output HDMI-1 --mode \"${APOLLO_CLIENT_WIDTH}x${APOLLO_CLIENT_HEIGHT}\" --rate ${APOLLO_CLIENT_FPS}"</pre>
-          </div>
-          <div class="form-text" v-else-if="platform === 'macos'"><b>{{ $t('apps.env_displayplacer_example') }}</b>
-            <pre>sh -c "displayplacer "id:&lt;screenId&gt; res:${APOLLO_CLIENT_WIDTH}x${APOLLO_CLIENT_HEIGHT} hz:${APOLLO_CLIENT_FPS} scaling:on origin:(0,0) degree:0""</pre>
-          </div>
+          <Platformlayout v-bind:platform="platform">
+            <template #windows>
+              <div class="form-text"><b>{{ $t('apps.env_rtss_cli_example') }}</b>
+                <pre>cmd /C \path\to\rtss-cli.exe limit:set %APOLLO_CLIENT_FPS%</pre>
+              </div>
+            </template>
+            <template #linux>
+              <div class="form-text"><b>{{ $t('apps.env_xrandr_example') }}</b>
+                <pre>sh -c "xrandr --output HDMI-1 --mode \"${APOLLO_CLIENT_WIDTH}x${APOLLO_CLIENT_HEIGHT}\" --rate ${APOLLO_CLIENT_FPS}"</pre>
+              </div>
+            </template>
+            <template #macos>
+              <div class="form-text"><b>{{ $t('apps.env_displayplacer_example') }}</b>
+                <pre>sh -c "displayplacer "id:&lt;screenId&gt; res:${APOLLO_CLIENT_WIDTH}x${APOLLO_CLIENT_HEIGHT} hz:${APOLLO_CLIENT_FPS} scaling:on origin:(0,0) degree:0""</pre>
+              </div>
+            </template>
+          </Platformlayout>
           <div class="form-text"><a
               href="https://docs.lizardbyte.dev/projects/sunshine/latest/md_docs_2app__examples.html"
               target="_blank">{{ $t('_common.see_more') }}</a></div>
@@ -441,6 +473,7 @@
   import { initApp } from './init'
   import Navbar from './Navbar.vue'
   import Checkbox from './Checkbox.vue'
+  import Platformlayout from './PlatformLayout.vue'
   import { Dropdown } from 'bootstrap/dist/js/bootstrap'
 
   const newApp = {
@@ -460,12 +493,16 @@
     "per-client-app-identity": false,
     "allow-client-commands": true,
     "virtual-display": false,
+    "gamepad": ""
   }
 
+  console.log(Platformlayout)
+
   const app = createApp({
     components: {
       Navbar,
-      Checkbox
+      Checkbox,
+      Platformlayout
     },
     data() {
       return {
diff --git a/src_assets/common/assets/web/public/assets/locale/en.json b/src_assets/common/assets/web/public/assets/locale/en.json
index 3b9095f3..8877baf0 100644
--- a/src_assets/common/assets/web/public/assets/locale/en.json
+++ b/src_assets/common/assets/web/public/assets/locale/en.json
@@ -7,6 +7,8 @@
     "cancel": "Cancel",
     "cmd_name": "Command Name",
     "cmd_val": "Command Value",
+    "default": "Default",
+    "default_global": "Default (Global)",
     "disabled": "Disabled",
     "disabled_def": "Disabled (default)",
     "disabled_def_cbox": "Default: unchecked",
diff --git a/src_assets/common/assets/web/public/assets/locale/zh.json b/src_assets/common/assets/web/public/assets/locale/zh.json
index 85292906..8bb6b266 100644
--- a/src_assets/common/assets/web/public/assets/locale/zh.json
+++ b/src_assets/common/assets/web/public/assets/locale/zh.json
@@ -7,6 +7,8 @@
     "cancel": "取消",
     "cmd_name": "命令名称",
     "cmd_val": "命令值",
+    "default": "默认",
+    "default_global": "默认（全局）",
     "disabled": "禁用",
     "disabled_def": "禁用（默认）",
     "disabled_def_cbox": "默认值：未选",