diff --git a/packages/react-app/src/components/modals/create-quest-modal.tsx b/packages/react-app/src/components/modals/create-quest-modal.tsx
index 6688d19e..23d795e8 100644
--- a/packages/react-app/src/components/modals/create-quest-modal.tsx
+++ b/packages/react-app/src/components/modals/create-quest-modal.tsx
@@ -236,7 +236,7 @@ export default function QuestModal({
       try {
         let txPayload: TransactionModel = {
           modalId,
-          message: `Creating Quest (2/${values.bounty?.parsedAmount ? '4' : '3'})`,
+          message: `Creating Quest (2/${totalTransactionSteps})`,
           status: TransactionStatus.WaitingForSignature,
           type: TransactionType.QuestCreate,
         };
diff --git a/packages/react-app/src/components/modals/player-list-modal.tsx b/packages/react-app/src/components/modals/player-list-modal.tsx
index bb5b677f..45678100 100644
--- a/packages/react-app/src/components/modals/player-list-modal.tsx
+++ b/packages/react-app/src/components/modals/player-list-modal.tsx
@@ -134,7 +134,8 @@ export default function PlayerListModal({
                   : 'View Player List'
               }
               mode="strong"
-              title="Player List"
+              title={!isEdit && !players.length ? 'No players' : 'View players'}
+              disabled={!isEdit && !players.length}
             />
           </OpenButtonWrapperStyled>
         }
diff --git a/packages/react-app/src/components/quest.tsx b/packages/react-app/src/components/quest.tsx
index 2a5c026c..681918af 100644
--- a/packages/react-app/src/components/quest.tsx
+++ b/packages/react-app/src/components/quest.tsx
@@ -471,12 +471,12 @@ export default function Quest({
                       walletAddress === questData.creatorAddress) && (
                       <PlayerListModal
                         questData={questData}
-                        isEdit={walletAddress === questData.creatorAddress}
+                        isEdit={walletAddress === questData.creatorAddress && questData.isWhitelist}
                       />
                     )}
                     <FundModal quest={questData} />
                     {(((!isPlayingQuest || questData.creatorAddress === walletAddress) &&
-                      questData.isWhitelist) ||
+                      !questData.isWhitelist) ||
                       (waitForClose && transaction?.type === TransactionType.QuestPlay)) &&
                       questData.features?.playableQuest && (
                         <PlayModal