diff --git a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st
index 0947b80f0e..ef13f1601b 100644
--- a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st
+++ b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st
@@ -19,7 +19,7 @@ IceTipAddRemoteCommand class >> defaultName [
 	^ 'Add remote'
 ]
 
-{ #category : #executing }
+{ #category : #testing }
 IceTipAddRemoteCommand >> canBeExecuted [
 	"Any repository can have more remotes."
 
diff --git a/Iceberg-TipUI/IceTipBrowseCommand.class.st b/Iceberg-TipUI/IceTipBrowseCommand.class.st
index d157e05f83..4f1a7e77d5 100644
--- a/Iceberg-TipUI/IceTipBrowseCommand.class.st
+++ b/Iceberg-TipUI/IceTipBrowseCommand.class.st
@@ -19,11 +19,11 @@ IceTipBrowseCommand class >> defaultName [
 	^ 'Browse...'
 ]
 
-{ #category : #executing }
+{ #category : #testing }
 IceTipBrowseCommand >> canBeExecuted [
+	"In the case of a method removal it is not possible to browse the selected element."
 
-	^ self hasSelectedItem
-
+	^ self hasSelectedItem and: [ self item value definition canBeBrowsed ]
 ]
 
 { #category : #executing }
diff --git a/Iceberg-TipUI/IceTipInspectCommand.class.st b/Iceberg-TipUI/IceTipInspectCommand.class.st
index 15c645273a..d50a4ee13d 100644
--- a/Iceberg-TipUI/IceTipInspectCommand.class.st
+++ b/Iceberg-TipUI/IceTipInspectCommand.class.st
@@ -19,7 +19,7 @@ IceTipInspectCommand class >> defaultName [
 	^ 'Inspect...'
 ]
 
-{ #category : #executing }
+{ #category : #testing }
 IceTipInspectCommand >> canBeExecuted [
 
 	^ self context hasSelectedItem
diff --git a/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st b/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st
index f3b82c3572..8007441af0 100644
--- a/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st
+++ b/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st
@@ -31,7 +31,7 @@ IceTipRemotesTreeCommand >> actsOnTag: aTagModel [
 	^ false
 ]
 
-{ #category : #executing }
+{ #category : #testing }
 IceTipRemotesTreeCommand >> canBeExecuted [
 
 	^ self hasSelectedItem and: [ self item canActivateCommand: self ]
diff --git a/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st b/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st
index 2af0da0c83..abe4c6c3f2 100644
--- a/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st
+++ b/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st
@@ -20,7 +20,7 @@ IceTipTreeCollapseCommand class >> defaultName [
 	^ 'Collapse'
 ]
 
-{ #category : #executing }
+{ #category : #testing }
 IceTipTreeCollapseCommand >> canBeExecuted [
 
 	^ self hasSelectedItem
diff --git a/Iceberg-TipUI/IceTipTreeExpandCommand.class.st b/Iceberg-TipUI/IceTipTreeExpandCommand.class.st
index 3126ca0dd2..b3e6aab770 100644
--- a/Iceberg-TipUI/IceTipTreeExpandCommand.class.st
+++ b/Iceberg-TipUI/IceTipTreeExpandCommand.class.st
@@ -19,7 +19,7 @@ IceTipTreeExpandCommand class >> defaultName [
 	^ 'Expand'
 ]
 
-{ #category : #executing }
+{ #category : #testing }
 IceTipTreeExpandCommand >> canBeExecuted [
 
 	^ self hasSelectedItem