diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java
index b5c4cb0d..eb3103e2 100644
--- a/src/main/java/com/sparrowwallet/sparrow/AppController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java
@@ -2133,6 +2133,11 @@ public class AppController implements Initializable {
             contextMenu.getItems().add(delete);
         }
 
+        contextMenu.setOnShowing(event -> {
+            Wallet renameWallet = AppServices.get().getWallet(walletId);
+            rename.setDisable(!renameWallet.isValid());
+        });
+
         return contextMenu;
     }
 
diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java b/src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java
index bcc7ca2c..e55c2ead 100644
--- a/src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java
+++ b/src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java
@@ -597,6 +597,10 @@ public class WalletForm {
     public void walletLabelChanged(WalletLabelChangedEvent event) {
         if(event.getWallet() == wallet) {
             Platform.runLater(() -> EventManager.get().post(new WalletDataChangedEvent(wallet)));
+
+            if(walletTransactionsEntry != null) {
+                walletTransactionsEntry.labelProperty().set(event.getWallet().getDisplayName());
+            }
         }
     }