diff --git a/package.json b/package.json
index bf55e50..3d4257e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ghost-dao-interface",
   "private": true,
-  "version": "0.5.24",
+  "version": "0.5.25",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/src/containers/Governance/ProposalDetails.jsx b/src/containers/Governance/ProposalDetails.jsx
index 2b6f890..09d011a 100644
--- a/src/containers/Governance/ProposalDetails.jsx
+++ b/src/containers/Governance/ProposalDetails.jsx
@@ -175,19 +175,19 @@ const ProposalDetails = ({ chainId, address, connect, config }) => {
             localStorage.setItem(`${VOTED_PROPOSALS_PREFIX}-${address}`, toStore);
         }
 
-        setIsPending(true);
+        setIsPending(false);
     }
 
     const handleExecute = async () => {
         setIsPending(true);
         await executeProposal(chainId, address, proposalId);
-        setIsPending(true);
+        setIsPending(false);
     }
 
     const handleRelease = async (proposalId) => {
         setIsPending(true);
         await releaseLocked(chainId, address, proposalId);
-        setIsPending(true);
+        setIsPending(false);
     }
 
     return (
@@ -343,6 +343,7 @@ const ProposalDetails = ({ chainId, address, connect, config }) => {
                                 isProposer={proposalProposer === address}
                                 chainId={chainId}
                                 proposalId={id}
+                                isPending={isPending}
                             />
                         </Paper>
                     </Box>
@@ -380,7 +381,7 @@ const ProposalDetails = ({ chainId, address, connect, config }) => {
     )
 }
 
-const VotingTimeline = ({ connect, handleExecute, handleRelease, proposalLocked, proposalId, chainId, state, address, isProposer }) => {
+const VotingTimeline = ({ connect, handleExecute, handleRelease, proposalLocked, proposalId, chainId, state, address, isProposer, isPending }) => {
     const { delay: propsalVotingDelay  } = useProposalVotingDelay(chainId, proposalId);
     const { snapshot: proposalSnapshot } = useProposalSnapshot(chainId, proposalId);
     const { deadline: proposalDeadline } = useProposalDeadline(chainId, proposalId);
@@ -400,19 +401,19 @@ const VotingTimeline = ({ connect, handleExecute, handleRelease, proposalLocked,
                 <VotingTimelineItem chainId={chainId} occured={proposalDeadline} message="Voting ends" />
             </Timeline>
             <Box width="100%" display="flex" gap="10px">
-                {isProposer && <SecondaryButton
+                {(isProposer || (proposalLocked?._value ?? 0n) > 0n) && <SecondaryButton
                     fullWidth
-                    disabled={(proposalLocked?._value ?? 0n) === 0n || state < 2}
+                    disabled={isPending || state < 2}
                     onClick={() => address === "" ? connect() : handleRelease()}
                 >
                     {address === "" ? "Connect" : "Release"}
                 </SecondaryButton>}
                 <SecondaryButton
                     fullWidth
-                    disabled={state !== 4}
+                    disabled={isPending || state !== 4}
                     onClick={() => address === "" ? connect() : handleExecute()}
                 >
-                    {address === "" ? "Connect" : "Execute"}
+                    {address === "" ? "Connect" : convertStatusToLabel(state)}
                 </SecondaryButton>
             </Box>
         </Box>