diff --git a/bt b/bt
index ce9158c..d4b294e 100755
--- a/bt
+++ b/bt
@@ -78,6 +78,14 @@ startup(){
 	fi
 }
 
+
+if [ "$1" = "edit" ]; then
+	case $2 in
+		"pairlist")${EDITOR:-vim} "$PAIRLIST" && exit;;
+		"blacklist")${EDITOR:-vim} "$BLACKLIST" && exit;;
+		*)true;;
+		esac
+fi
 #Sadly needs to be run without '&' for now, since it otherwise breaks start_scan variable
 startup &
 update_pair_list &