diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c
index 81d79de08c5..15a678e0ecc 100644
--- a/source/blender/src/editmesh_mods.c
+++ b/source/blender/src/editmesh_mods.c
@@ -3187,12 +3187,14 @@ void select_non_manifold(void)
 	}
 
 	/* select isolated verts */
-	eve= em->verts.first;
-	while(eve) {
-		if (eve->f1 == 0) {
-			if (!eve->h) eve->f |= SELECT;
+	if(G.scene->selectmode & SCE_SELECT_VERTEX) {
+		eve= em->verts.first;
+		while(eve) {
+			if (eve->f1 == 0) {
+				if (!eve->h) eve->f |= SELECT;
+			}
+			eve= eve->next;
 		}
-		eve= eve->next;
 	}
 
 	countall();