diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityAirdropsSettingsPanel.qml b/ui/app/AppLayouts/Chat/panels/communities/CommunityAirdropsSettingsPanel.qml
index 1acb68cc0d..b9badf3baa 100644
--- a/ui/app/AppLayouts/Chat/panels/communities/CommunityAirdropsSettingsPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/communities/CommunityAirdropsSettingsPanel.qml
@@ -81,7 +81,10 @@ SettingsPageLayout {
         }
     ]
 
-    onPrimaryHeaderButtonClicked: stackManager.push(d.newAirdropViewState, newAirdropView, null, StackView.Immediate)
+    onPrimaryHeaderButtonClicked: {
+        if(root.state !== d.newAirdropViewState)
+            stackManager.push(d.newAirdropViewState, newAirdropView, null, StackView.Immediate)
+    }
 
     StackViewStates {
         id: stackManager
diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityMintTokensSettingsPanel.qml b/ui/app/AppLayouts/Chat/panels/communities/CommunityMintTokensSettingsPanel.qml
index e5601c1909..40517dcea1 100644
--- a/ui/app/AppLayouts/Chat/panels/communities/CommunityMintTokensSettingsPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/communities/CommunityMintTokensSettingsPanel.qml
@@ -54,7 +54,7 @@ SettingsPageLayout {
 
     signal burnToken(string tokenKey, int amount)
 
-    signal airdropToken(string tokenKey)
+    signal airdropToken(string tokenKey, int type, var addresses)
 
     signal deleteToken(string tokenKey)
 
diff --git a/ui/app/AppLayouts/Chat/views/communities/CommunityNewAirdropView.qml b/ui/app/AppLayouts/Chat/views/communities/CommunityNewAirdropView.qml
index cc2d988056..322fda311a 100644
--- a/ui/app/AppLayouts/Chat/views/communities/CommunityNewAirdropView.qml
+++ b/ui/app/AppLayouts/Chat/views/communities/CommunityNewAirdropView.qml
@@ -79,6 +79,8 @@ StatusScrollView {
     signal navigateToMintTokenSettings(bool isAssetType)
 
     function selectToken(key, amount, type) {
+        if(selectedHoldingsModel)
+            selectedHoldingsModel.clear()
         var tokenModel = null
         if(type === Constants.TokenType.ERC20)
             tokenModel = root.assetsModel