diff --git a/src/commands/ssh.sh b/src/commands/ssh.sh
index ccb1edf..2d7ba3e 100644
--- a/src/commands/ssh.sh
+++ b/src/commands/ssh.sh
@@ -1,6 +1,9 @@
 wx-ssh(){
     wx-login
 
+    mkdir -p $HOME/.ssh/keys
+    chmod 700 -R $HOME/.ssh/keys
+
     case $1 in
         sign)
             wx-ssh-sign
diff --git a/src/commands/ssh/sign.sh b/src/commands/ssh/sign.sh
index 148421d..8ef1234 100644
--- a/src/commands/ssh/sign.sh
+++ b/src/commands/ssh/sign.sh
@@ -17,10 +17,6 @@ wx-ssh-sign(){
 }
 
 wx-ssh-sign-create(){
-    mkdir -p $HOME/.ssh/keys
-    chmod 700 $HOME/.ssh/keys
-    chmod 600 $HOME/.ssh/keys/*
-
     NAME=$1
     ROLE=$2
     PRINCIPALS=$2
diff --git a/wx b/wx
index 16a0c97..9871bd3 100755
--- a/wx
+++ b/wx
@@ -322,6 +322,9 @@ wx-settings(){
 wx-ssh(){
     wx-login
 
+    mkdir -p $HOME/.ssh/keys
+    chmod 700 -R $HOME/.ssh/keys
+
     case $1 in
         sign)
             wx-ssh-sign
@@ -469,10 +472,6 @@ wx-ssh-sign(){
 }
 
 wx-ssh-sign-create(){
-    mkdir -p $HOME/.ssh/keys
-    chmod 700 $HOME/.ssh/keys
-    chmod 600 $HOME/.ssh/keys/*
-
     NAME=$1
     ROLE=$2
     PRINCIPALS=$2