diff --git a/src/views/nodes/branchTrackingStatusNode.ts b/src/views/nodes/branchTrackingStatusNode.ts
index 9d4ab81..b586375 100644
--- a/src/views/nodes/branchTrackingStatusNode.ts
+++ b/src/views/nodes/branchTrackingStatusNode.ts
@@ -1,4 +1,4 @@
-import { MarkdownString, ThemeColor, ThemeIcon, TreeItem, TreeItemCollapsibleState, Uri, window } from 'vscode';
+import { MarkdownString, ThemeColor, ThemeIcon, TreeItem, TreeItemCollapsibleState, window } from 'vscode';
 import type { Colors } from '../../constants';
 import { GitUri } from '../../git/gitUri';
 import type { GitBranch, GitTrackingState } from '../../git/models/branch';
diff --git a/src/views/nodes/mergeStatusNode.ts b/src/views/nodes/mergeStatusNode.ts
index 80567d2..19665a0 100644
--- a/src/views/nodes/mergeStatusNode.ts
+++ b/src/views/nodes/mergeStatusNode.ts
@@ -1,4 +1,4 @@
-import { MarkdownString, ThemeColor, ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode';
+import { MarkdownString, ThemeColor, ThemeIcon, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode';
 import type { Colors } from '../../constants';
 import { GitUri } from '../../git/gitUri';
 import type { GitBranch } from '../../git/models/branch';
@@ -75,6 +75,7 @@ export class MergeStatusNode extends ViewNode<'merge-status', ViewsWithCommits>
 		markdown.isTrusted = true;
 
 		item.tooltip = markdown;
+		item.resourceUri = Uri.parse(`gitlens-view://status/merging${hasConflicts ? '/conflicts' : ''}`);
 
 		return item;
 	}
diff --git a/src/views/viewDecorationProvider.ts b/src/views/viewDecorationProvider.ts
index e2ecfc6..030501c 100644
--- a/src/views/viewDecorationProvider.ts
+++ b/src/views/viewDecorationProvider.ts
@@ -238,6 +238,7 @@ export class ViewFileDecorationProvider implements FileDecorationProvider, Dispo
 
 		switch (status) {
 			case 'rebasing':
+			case 'merging':
 				if (conflicts) {
 					return {
 						badge: '!',