diff --git a/src/modules/peers/PeerConnectButton.tsx b/src/modules/peers/PeerConnectButton.tsx
index c0e148c..96af981 100644
--- a/src/modules/peers/PeerConnectButton.tsx
+++ b/src/modules/peers/PeerConnectButton.tsx
@@ -22,44 +22,35 @@ export const PeerConnectButton = () => {
   if (isMobile) return;
 
   return isConnected ? (
-    // <>
-    //   <DropdownMenu modal={false}>
-    //     <DropdownMenuTrigger
-    //       asChild={true}
-    //       onClick={(e) => {
-    //         e.stopPropagation();
-    //         e.preventDefault();
-    //       }}
-    //     >
-    //       <div className={"group"}>
-    //         <ConnectButton />
-    //       </div>
-    //     </DropdownMenuTrigger>
-    //     <DropdownMenuContent
-    //       className="w-auto"
-    //       align="start"
-    //       side={"bottom"}
-    //       sideOffset={8}
-    //     >
-    //       <SSHButton peer={peer} isDropdown={true} />
-    //       <RDPButton peer={peer} isDropdown={true} />
-    //     </DropdownMenuContent>
-    //   </DropdownMenu>
-    // </>
-      <FullTooltip
-          content={
-              <div className={"max-w-[200px] text-xs"}>
-                  Connecting via SSH or RDP is coming soon.
-              </div>
-          }
-      >
-          <ConnectButton disabled={true} />
-      </FullTooltip>
+    <>
+      <DropdownMenu modal={false}>
+        <DropdownMenuTrigger
+          asChild={true}
+          onClick={(e) => {
+            e.stopPropagation();
+            e.preventDefault();
+          }}
+        >
+          <div className={"group"}>
+            <ConnectButton />
+          </div>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent
+          className="w-auto"
+          align="start"
+          side={"bottom"}
+          sideOffset={8}
+        >
+          <SSHButton peer={peer} isDropdown={true} />
+          <RDPButton peer={peer} isDropdown={true} />
+        </DropdownMenuContent>
+      </DropdownMenu>
+    </>
   ) : (
     <FullTooltip
       content={
         <div className={"max-w-[200px] text-xs"}>
-          Connecting via SSH or RDP is coming soon.
+            Connecting via SSH or RDP is only available when the peer is online.
         </div>
       }
     >
diff --git a/src/modules/remote-access/rdp/RDPButton.tsx b/src/modules/remote-access/rdp/RDPButton.tsx
index c713b9e..d16cba1 100644
--- a/src/modules/remote-access/rdp/RDPButton.tsx
+++ b/src/modules/remote-access/rdp/RDPButton.tsx
@@ -37,8 +37,7 @@ export const RDPButton = ({ peer, isDropdown = false }: Props) => {
       <>
         <div>
           <RDPTooltip
-            //disabled={!disabled}
-            disabled={true}
+            disabled={!disabled}
             hasPermission={hasPermission}
             side={isDropdown ? "left" : "top"}
           >
diff --git a/src/modules/remote-access/ssh/SSHButton.tsx b/src/modules/remote-access/ssh/SSHButton.tsx
index 032ce20..cef1514 100644
--- a/src/modules/remote-access/ssh/SSHButton.tsx
+++ b/src/modules/remote-access/ssh/SSHButton.tsx
@@ -41,8 +41,7 @@ export const SSHButton = ({ peer, isDropdown = false }: Props) => {
         )}
         <div>
           <SSHTooltip
-            //disabled={!disabled}
-            disabled={true}
+            disabled={!disabled}
             hasPermission={hasPermission}
             side={isDropdown ? "left" : "top"}
           >