diff --git a/amaranth/__init__.py b/amaranth/__init__.py
index 55871cc16ef622f1180485cb9dd5f279a6b3054e..4cefaf0f32b5aa8bb9af07a10e73fe2bfc955a4a 100644
--- a/amaranth/__init__.py
+++ b/amaranth/__init__.py
@@ -74,7 +74,7 @@ from amaranth.misc import (
 bl_info = {
     "name": "Amaranth Toolset",
     "author": "Pablo Vazquez, Bassam Kurdali, Sergey Sharybin, Lukas Tönne, Cesar Saez, CansecoGPC",
-    "version": (1, 0, 14),
+    "version": (1, 0, 15),
     "blender": (3, 2, 0),
     "location": "Everywhere!",
     "description": "A collection of tools and settings to improve productivity",
diff --git a/amaranth/node_editor/display_image.py b/amaranth/node_editor/display_image.py
index b15be590b6656f3c8d8a220d36043a5ca608c3e9..75480a902e396854b1d9dbd96ba653408ba89fbf 100644
--- a/amaranth/node_editor/display_image.py
+++ b/amaranth/node_editor/display_image.py
@@ -32,7 +32,7 @@ class AMTH_NODE_OT_show_active_node_image(bpy.types.Operator):
 
     @classmethod
     def poll(cls, context):
-        return context.active_node is not None
+        return context.space_data == 'NODE_EDITOR' and context.active_node is not None
 
     def execute(self, context):
         return {'FINISHED'}
diff --git a/amaranth/render/border_camera.py b/amaranth/render/border_camera.py
index 03d93e7b2656104a88a4c57db3ea731a274a88b6..0ae12ed7b97c7d6b824cb685953458617283e39f 100644
--- a/amaranth/render/border_camera.py
+++ b/amaranth/render/border_camera.py
@@ -18,7 +18,7 @@ class AMTH_VIEW3D_OT_render_border_camera(bpy.types.Operator):
 
     @classmethod
     def poll(cls, context):
-        return context.space_data.region_3d.view_perspective == "CAMERA"
+        return context.space_data == 'VIEW_3D' and context.space_data.region_3d.view_perspective == "CAMERA"
 
     def execute(self, context):
         render = context.scene.render