diff --git a/completions/lvm b/completions/lvm
index b657e0bd..85487533 100644
--- a/completions/lvm
+++ b/completions/lvm
@@ -16,6 +16,13 @@ _logicalvolumes()
 {
     COMPREPLY=( $(compgen -W "$( lvscan 2>/dev/null | \
         sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur" ) )
+    if [[ $cur == /dev/mapper/* ]]; then
+        _filedir
+        local i
+        for i in ${!COMPREPLY[@]}; do
+            [[ ${COMPREPLY[i]} == */control ]] && unset COMPREPLY[i]
+        done
+    fi
 }
 
 _units()