diff --git a/APKToolGUI/Forms/FormMain.Designer.cs b/APKToolGUI/Forms/FormMain.Designer.cs
index dd64deb..486781c 100644
--- a/APKToolGUI/Forms/FormMain.Designer.cs
+++ b/APKToolGUI/Forms/FormMain.Designer.cs
@@ -64,6 +64,8 @@
             this.tabPageApkInfo = new System.Windows.Forms.TabPage();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.basicInfoTabPage = new System.Windows.Forms.TabPage();
+            this.launchActivityTxtBox = new System.Windows.Forms.TextBox();
+            this.label31 = new System.Windows.Forms.Label();
             this.archSdkTxtBox = new System.Windows.Forms.TextBox();
             this.label30 = new System.Windows.Forms.Label();
             this.apkDlLinkBtn = new System.Windows.Forms.Button();
@@ -245,8 +247,6 @@
             this.apktoolIssuesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.baksmaliIssuesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.label31 = new System.Windows.Forms.Label();
-            this.launchActivityTxtBox = new System.Windows.Forms.TextBox();
             this.tabControlMain.SuspendLayout();
             this.tabPageMain.SuspendLayout();
             this.signPanel.SuspendLayout();
@@ -579,6 +579,17 @@
             this.basicInfoTabPage.Name = "basicInfoTabPage";
             this.basicInfoTabPage.UseVisualStyleBackColor = true;
             // 
+            // launchActivityTxtBox
+            // 
+            resources.ApplyResources(this.launchActivityTxtBox, "launchActivityTxtBox");
+            this.launchActivityTxtBox.Name = "launchActivityTxtBox";
+            this.launchActivityTxtBox.ReadOnly = true;
+            // 
+            // label31
+            // 
+            resources.ApplyResources(this.label31, "label31");
+            this.label31.Name = "label31";
+            // 
             // archSdkTxtBox
             // 
             resources.ApplyResources(this.archSdkTxtBox, "archSdkTxtBox");
@@ -1944,17 +1955,6 @@
             resources.ApplyResources(this.aboutToolStripMenuItem, "aboutToolStripMenuItem");
             this.aboutToolStripMenuItem.Click += new System.EventHandler(this.menuItemAbout_Click);
             // 
-            // label31
-            // 
-            resources.ApplyResources(this.label31, "label31");
-            this.label31.Name = "label31";
-            // 
-            // launchActivityTxtBox
-            // 
-            resources.ApplyResources(this.launchActivityTxtBox, "launchActivityTxtBox");
-            this.launchActivityTxtBox.Name = "launchActivityTxtBox";
-            this.launchActivityTxtBox.ReadOnly = true;
-            // 
             // FormMain
             // 
             this.AllowDrop = true;
diff --git a/APKToolGUI/Handlers/DecodeControlEventHandlers.cs b/APKToolGUI/Handlers/DecodeControlEventHandlers.cs
index 3446b43..966ee28 100644
--- a/APKToolGUI/Handlers/DecodeControlEventHandlers.cs
+++ b/APKToolGUI/Handlers/DecodeControlEventHandlers.cs
@@ -79,13 +79,13 @@ namespace APKToolGUI.Handlers
                 }
                 if (main.checkBox_DECODE_OutputDirectory.Checked)
                 {
-                    if (String.IsNullOrWhiteSpace(main.textBox_DECODE_OutputDirectory.Text))
+                    if (String.IsNullOrWhiteSpace(Settings.Default.Decode_OutputDir))
                     {
                         main.ShowMessage(Language.DecodeDirNotSelected, MessageBoxIcon.Warning);
                         return;
                     }
                     else
-                        if (!PathUtils.IsValidPath(main.textBox_DECODE_OutputDirectory.Text))
+                        if (!PathUtils.IsValidPath(Settings.Default.Decode_OutputDir))
                     {
                         main.ShowMessage(Language.DecodeCouldNotCreate, MessageBoxIcon.Warning);
                         return;
@@ -110,8 +110,8 @@ namespace APKToolGUI.Handlers
         
         internal void decOutOpenDirBtn_Click(object sender, EventArgs e)
         {
-            if (Directory.Exists(main.textBox_DECODE_OutputDirectory.Text))
-                Process.Start("explorer.exe", main.textBox_DECODE_OutputDirectory.Text);
+            if (Directory.Exists(Settings.Default.Decode_OutputDir))
+                Process.Start("explorer.exe", Settings.Default.Decode_OutputDir);
             else
             {
                 main.ToLog(ApktoolEventType.Error, Language.ErrorSelectedOutputFolderNotExist);