diff --git a/src/server/connection.rs b/src/server/connection.rs
index f68c13895..90548afc7 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -6,7 +6,7 @@ use crate::common::update_clipboard;
 use crate::video_service;
 #[cfg(any(target_os = "android", target_os = "ios"))]
 use crate::{common::MOBILE_INFO2, mobile::connection_manager::start_channel};
-use crate::{ipc, VERSION};
+use crate::{ipc};
 use hbb_common::{
     config::Config,
     fs,
diff --git a/src/ui/cm.rs b/src/ui/cm.rs
index 38bfc9359..e2d912c63 100644
--- a/src/ui/cm.rs
+++ b/src/ui/cm.rs
@@ -1,5 +1,4 @@
 use crate::ipc::{self, new_listener, Connection, Data};
-use crate::VERSION;
 #[cfg(windows)]
 use clipboard::{
     create_cliprdr_context, empty_clipboard, get_rx_clip_client, server_clip_file, set_conn_enabled,
diff --git a/src/ui/remote.rs b/src/ui/remote.rs
index bccd6ad79..9bf125cc0 100644
--- a/src/ui/remote.rs
+++ b/src/ui/remote.rs
@@ -1189,7 +1189,7 @@ impl Handler {
         let alt = get_key_state(enigo::Key::Alt);
         #[cfg(windows)]
         let ctrl = {
-            let mut tmp = get_key_state(enigo::Key::Control);
+            let mut tmp = get_key_state(enigo::Key::Control) || get_key_state(enigo::Key::RightControl);
             unsafe {
                 if IS_ALT_GR {
                     if alt || key == RdevKey::AltGr {
@@ -1204,8 +1204,8 @@ impl Handler {
             tmp
         };
         #[cfg(not(windows))]
-        let ctrl = get_key_state(enigo::Key::Control);
-        let shift = get_key_state(enigo::Key::Shift);
+        let ctrl = get_key_state(enigo::Key::Control) || get_key_state(enigo::Key::RightControl);
+        let shift = get_key_state(enigo::Key::Shift) || get_key_state(enigo::Key::RightShift);
         #[cfg(windows)]
         let command = crate::platform::windows::get_win_key_state();
         #[cfg(not(windows))]
@@ -1389,6 +1389,7 @@ impl Handler {
         if down_or_up == true {
             key_event.down = true;
         }
+        dbg!(&key_event);
         self.send_key_event(key_event, KeyboardMode::Legacy)
     }