diff --git a/release/scripts/startup/bl_operators/view3d.py b/release/scripts/startup/bl_operators/view3d.py
index b0c0c2a9299..58ddc50c808 100644
--- a/release/scripts/startup/bl_operators/view3d.py
+++ b/release/scripts/startup/bl_operators/view3d.py
@@ -219,6 +219,8 @@ class VIEW3D_OT_select_or_deselect_all(Operator):
                     select_all = bpy.ops.mball.select_all
                 elif active_object.type == 'ARMATURE':
                     select_all = bpy.ops.armature.select_all
+                else:
+                    return retval
             elif active_object.mode == 'POSE':
                 select_all = bpy.ops.pose.select_all
             elif active_object.mode == 'PARTICLE_EDIT':