diff --git a/APKToolGUI/Forms/FormMain.cs b/APKToolGUI/Forms/FormMain.cs
index 6f73c90..ed2330d 100644
--- a/APKToolGUI/Forms/FormMain.cs
+++ b/APKToolGUI/Forms/FormMain.cs
@@ -636,7 +636,10 @@ await Task.Factory.StartNew(() =>
                     code = apkeditor.Merge(extractedDir, tempApk);
                     if (code == 0)
                     {
-                        code = apktool.Decompile(tempApk, tempDecApk);
+                        if (useAPKEditorForDecompilingItem.Checked)
+                            code = apkeditor.Decompile(tempApk, tempDecApk);
+                        else
+                            code = apktool.Decompile(tempApk, tempDecApk);
 
                         if (code == 0)
                         {
diff --git a/APKToolGUI/Handlers/DecodeControlEventHandlers.cs b/APKToolGUI/Handlers/DecodeControlEventHandlers.cs
index a79afc5..763ba2d 100644
--- a/APKToolGUI/Handlers/DecodeControlEventHandlers.cs
+++ b/APKToolGUI/Handlers/DecodeControlEventHandlers.cs
@@ -96,7 +96,7 @@ internal async void button_DECODE_Decode_Click(object sender, EventArgs e)
                     }
                 }
 
-                if (inputFile.ContainsAny(".xapk", ".zip", ".apks", ".apkm") && !main.useAPKEditorForDecompilingItem.Checked)
+                if (inputFile.ContainsAny(".xapk", ".zip", ".apks", ".apkm"))
                 {
                     await main.MergeAndDecompile(inputFile);
                 }
diff --git a/APKToolGUI/Handlers/DragDropHandlers.cs b/APKToolGUI/Handlers/DragDropHandlers.cs
index 333ac85..93b1757 100644
--- a/APKToolGUI/Handlers/DragDropHandlers.cs
+++ b/APKToolGUI/Handlers/DragDropHandlers.cs
@@ -93,7 +93,7 @@ private async void DropApkToDec(DragEventArgs e)
                     if (!Settings.Default.Decode_DontParseApkInfo)
                         await main.GetApkInfo(apkFile);
 
-                    if (apkFile.ContainsAny(".xapk", ".zip", ".apks", ".apkm") && !main.useAPKEditorForDecompilingItem.Checked)
+                    if (apkFile.ContainsAny(".xapk", ".zip", ".apks", ".apkm"))
                     {
                         await main.MergeAndDecompile(apkFile);
                     }