diff --git a/core/ui/EditorToolbar/editor-height.tid b/core/ui/EditorToolbar/editor-height.tid
index c6c45775f..a8bb2ca13 100644
--- a/core/ui/EditorToolbar/editor-height.tid
+++ b/core/ui/EditorToolbar/editor-height.tid
@@ -4,7 +4,7 @@ icon: $:/core/images/fixed-height
 custom-icon: yes
 caption: {{$:/language/Buttons/EditorHeight/Caption}}
 description: {{$:/language/Buttons/EditorHeight/Hint}}
-condition: [<targetTiddler>!is[image]]
+condition: [<targetTiddler>type[]] [<targetTiddler>get[type]prefix[text/]] +[first[]]
 dropdown: $:/core/ui/EditorToolbar/editor-height-dropdown
 
 <$reveal tag="span" state="$:/config/TextEditor/EditorHeight/Mode" type="match" text="fixed">
diff --git a/core/ui/EditorToolbar/excise.tid b/core/ui/EditorToolbar/excise.tid
index dc2b34d3b..7eb505c23 100644
--- a/core/ui/EditorToolbar/excise.tid
+++ b/core/ui/EditorToolbar/excise.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/excise
 caption: {{$:/language/Buttons/Excise/Caption}}
 description: {{$:/language/Buttons/Excise/Hint}}
-condition: [<targetTiddler>!is[image]]
+condition: [<targetTiddler>type[]] [<targetTiddler>type[text/vnc.tiddlywiki]] +[first[]]
 shortcuts: ((excise))
 dropdown: $:/core/ui/EditorToolbar/excise-dropdown
 
diff --git a/core/ui/EditorToolbar/stamp.tid b/core/ui/EditorToolbar/stamp.tid
index bd83a2928..af57feb4b 100644
--- a/core/ui/EditorToolbar/stamp.tid
+++ b/core/ui/EditorToolbar/stamp.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/stamp
 caption: {{$:/language/Buttons/Stamp/Caption}}
 description: {{$:/language/Buttons/Stamp/Hint}}
-condition: [<targetTiddler>!is[image]]
+condition: [<targetTiddler>type[]] [<targetTiddler>get[type]prefix[text/]] +[first[]]
 shortcuts: ((stamp))
 dropdown: $:/core/ui/EditorToolbar/stamp-dropdown
 text: