diff --git a/src/server/connection.rs b/src/server/connection.rs
index 570e3e908..42e339737 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -1309,6 +1309,7 @@ impl Connection {
                 && crate::platform::is_share_rdp()
                 && raii::AuthedConnID::remote_and_file_conn_count() == 1
                 && sessions.len() > 1
+                && sessions.iter().any(|e| e.sid == current_sid)
                 && (get_version_number(&self.lr.version) > get_version_number("1.2.4")
                     || self.lr.option.support_windows_specific_session == BoolOption::Yes.into())
             {
diff --git a/src/ui_session_interface.rs b/src/ui_session_interface.rs
index 0674643f9..3edccd5d7 100644
--- a/src/ui_session_interface.rs
+++ b/src/ui_session_interface.rs
@@ -1269,6 +1269,14 @@ impl<T: InvokeUiSession> Session<T> {
                             self.on_error(
                                 "No active console user logged on, please connect and logon first.",
                             );
+                        } else {
+                            #[cfg(not(feature = "flutter"))]
+                            {
+                                let remote_dir = self.get_option("remote_dir".to_string());
+                                let show_hidden =
+                                    !self.get_option("remote_show_hidden".to_string()).is_empty();
+                                self.read_remote_dir(remote_dir, show_hidden);
+                            }
                         }
                     } else {
                         self.msgbox(