diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java
index 3ace8007f1..6e973186b8 100644
--- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java
+++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java
@@ -411,6 +411,8 @@ public abstract class MutableOfferView<M extends MutableOfferViewModel> extends
 
         model.onShowPayFundsScreen();
 
+        paymentAccountsComboBox.setDisable(true);
+
         editOfferElements.forEach(node -> {
             node.setMouseTransparent(true);
             node.setFocusTraversable(false);
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
index 27d5d9365f..f7a4c75c49 100644
--- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
+++ b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
@@ -484,9 +484,11 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
 
         model.onShowPayFundsScreen();
 
-        paymentAccountsComboBox.setMouseTransparent(true);
-        paymentAccountsComboBox.setDisable(true);
-        paymentAccountsComboBox.setFocusTraversable(false);
+        if (DevEnv.isDaoActivated()) {
+            paymentAccountsComboBox.setMouseTransparent(true);
+            paymentAccountsComboBox.setDisable(true);
+            paymentAccountsComboBox.setFocusTraversable(false);
+        }
 
         amountTextField.setMouseTransparent(true);
         amountTextField.setDisable(false);