2 files changed, 10 insertions, 0 deletions

diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 2ed70664b..251b23905 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -156,6 +156,7 @@ dig
 digikam
 dillo
 dino
+dino-im
 discord
 discord-canary
 display
@@ -441,6 +442,7 @@ min
 mindless
 minetest
 mirrormagic
+mocp
 mousepad
 mp3splt
 mp3splt-gtk
@@ -549,6 +551,7 @@ planmaker18
 planmaker18free
 playonlinux
 pluma
+plv
 pngquant
 polari
 ppsspp
diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index b906f3047..2000ffc62 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -111,6 +111,13 @@ static void disable_file(OPERATION op, const char *filename) {
                 return;
         }
 
+        // check for firejail executable
+        // we migth have a file found in ${PATH} pointing to /usr/bin/firejail
+        // blacklisting it here will end up breaking situations like user clicks on a link in Thunderbird
+        //     and expects Firefox to open in the same sandbox
+        if (strcmp(BINDIR "/firejail", fname) == 0)
+                return;
+
         // modify the file
         if (op == BLACKLIST_FILE || op == BLACKLIST_NOLOG) {
                 // some distros put all executables under /usr/bin and make /bin a symbolic link