diff --git a/gitbutler-ui/src/lib/components/CommitList.svelte b/gitbutler-ui/src/lib/components/CommitList.svelte
index 9111e8a03..8b1af574e 100644
--- a/gitbutler-ui/src/lib/components/CommitList.svelte
+++ b/gitbutler-ui/src/lib/components/CommitList.svelte
@@ -25,10 +25,13 @@
 	$: headCommit = branch.commits[0];
 
 	$: commits = type == 'upstream' ? [] : branch.commits.filter((c) => c.status == type);
+    $: hasCommits = commits && commits.length > 0;
+    $: remoteRequiresForcePush = type === 'remote' && branch.requiresForce;
+
 	let expanded = true;
 </script>
 
-{#if commits && commits.length > 0}
+{#if hasCommits || remoteRequiresForcePush }
 	<div
 		class="commit-list card"
 		class:upstream={type == 'upstream'}
diff --git a/gitbutler-ui/src/lib/components/CommitListFooter.svelte b/gitbutler-ui/src/lib/components/CommitListFooter.svelte
index 594710f65..906849d5c 100644
--- a/gitbutler-ui/src/lib/components/CommitListFooter.svelte
+++ b/gitbutler-ui/src/lib/components/CommitListFooter.svelte
@@ -75,7 +75,9 @@
 			<PushButton
 				wide
 				isLoading={isPushing || $githubServiceState$?.busy}
-				isPushed={type == 'remote'}
+				isPushed={type == 'remote' && !branch.requiresForce}
+                requiresForcePush={branch.requiresForce}
+                isPr={$pr$}
 				{projectId}
 				githubEnabled={$githubEnabled$}
 				on:trigger={async (e) => {
diff --git a/gitbutler-ui/src/lib/components/PushButton.svelte b/gitbutler-ui/src/lib/components/PushButton.svelte
index fd926ad3a..3d7887029 100644
--- a/gitbutler-ui/src/lib/components/PushButton.svelte
+++ b/gitbutler-ui/src/lib/components/PushButton.svelte
@@ -7,6 +7,7 @@
 </script>
 
 <script lang="ts">
+	import Button from '$lib/components/Button.svelte';
 	import DropDownButton from '$lib/components/DropDownButton.svelte';
 	import ContextMenu from '$lib/components/contextmenu/ContextMenu.svelte';
 	import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
@@ -20,6 +21,8 @@
 	export let isLoading = false;
 	export let githubEnabled: boolean;
 	export let wide = false;
+    export let requiresForcePush = false;
+    export let isPr = false;
 
 	function defaultAction(projectId: string): Persisted<BranchAction> {
 		const key = 'projectDefaultAction_';
@@ -49,61 +52,75 @@
 		}
 		return preferredAction;
 	}
+
+    $: pushLabel = requiresForcePush ? 'Force push to remote' : 'Push to remote'
 </script>
 
-<DropDownButton
-	color="primary"
-	kind="outlined"
-	loading={isLoading}
-	bind:this={dropDown}
-	{wide}
-	{disabled}
-	on:click={() => {
-		dispatch('trigger', { action });
-	}}
->
-	{$selection$?.label}
-	<ContextMenu
-		type="select"
-		slot="context-menu"
-		bind:this={contextMenu}
-		on:select={(e) => {
-			// TODO: Refactor to use generics if/when that works with Svelte
-			switch (e.detail?.id) {
-				case BranchAction.Push:
-					$preferredAction = BranchAction.Push;
-					break;
-				case BranchAction.Pr:
-					$preferredAction = BranchAction.Pr;
-					break;
-				case BranchAction.DraftPr:
-					$preferredAction = BranchAction.DraftPr;
-					break;
-				default:
-					toasts.error('Uknown branch action');
-			}
-			dropDown.close();
-		}}
-	>
-		<ContextMenuSection>
-			<ContextMenuItem
-				id="push"
-				label="Push to remote"
-				selected={action == BranchAction.Push}
-				disabled={isPushed}
-			/>
-			<ContextMenuItem
-				id="pr"
-				label="Create pull request"
-				disabled={!githubEnabled}
-				selected={action == BranchAction.Pr}
-			/>
-			<ContextMenuItem
-				id="draftPr"
-				label="Create draft pull request"
-				disabled={!githubEnabled}
-				selected={action == BranchAction.DraftPr}
-			/>
-		</ContextMenuSection>
-	</ContextMenu>
-</DropDownButton>
+{#if isPr && requiresForcePush }
+    <Button
+        color="primary"
+        kind="outlined"
+        {wide}
+        disabled={isPushed}
+        on:click={() => {
+            dispatch('trigger', { action: BranchAction.Push });
+        }}>{pushLabel}</Button
+    >
+{:else if !isPr }
+    <DropDownButton
+        color="primary"
+        kind="outlined"
+        loading={isLoading}
+        bind:this={dropDown}
+        {wide}
+        {disabled}
+        on:click={() => {
+            dispatch('trigger', { action });
+        }}
+    >
+        {$selection$?.label}
+        <ContextMenu
+            type="select"
+            slot="context-menu"
+            bind:this={contextMenu}
+            on:select={(e) => {
+                // TODO: Refactor to use generics if/when that works with Svelte
+                switch (e.detail?.id) {
+                    case BranchAction.Push:
+                        $preferredAction = BranchAction.Push;
+                        break;
+                    case BranchAction.Pr:
+                        $preferredAction = BranchAction.Pr;
+                        break;
+                    case BranchAction.DraftPr:
+                        $preferredAction = BranchAction.DraftPr;
+                        break;
+                    default:
+                        toasts.error('Uknown branch action');
+                }
+                dropDown.close();
+            }}
+        >
+            <ContextMenuSection>
+                <ContextMenuItem
+                    id="push"
+                    label={pushLabel}
+                    selected={action == BranchAction.Push}
+                    disabled={isPushed}
+                />
+                <ContextMenuItem
+                    id="pr"
+                    label="Create pull request"
+                    disabled={!githubEnabled}
+                    selected={action == BranchAction.Pr}
+                />
+                <ContextMenuItem
+                    id="draftPr"
+                    label="Create draft pull request"
+                    disabled={!githubEnabled}
+                    selected={action == BranchAction.DraftPr}
+                />
+            </ContextMenuSection>
+        </ContextMenu>
+    </DropDownButton>
+{/if}