diff --git a/Rubberduck.Core/UI/CodeExplorer/Commands/AddComponentCommand.cs b/Rubberduck.Core/UI/CodeExplorer/Commands/AddComponentCommand.cs
index 796e05cb83..b6e818ad47 100644
--- a/Rubberduck.Core/UI/CodeExplorer/Commands/AddComponentCommand.cs
+++ b/Rubberduck.Core/UI/CodeExplorer/Commands/AddComponentCommand.cs
@@ -9,7 +9,6 @@ namespace Rubberduck.UI.CodeExplorer.Commands
     public class AddComponentCommand
     {
         private readonly IVBE _vbe;
-        private const string DefaultFolder = "VBAProject";
 
         public AddComponentCommand(IVBE vbe)
         {
@@ -69,16 +68,22 @@ private Declaration GetDeclaration(CodeExplorerItemViewModel node)
 
             return (node as ICodeExplorerDeclarationViewModel)?.Declaration;
         }
-
+        private string GetActiveProjectName()
+        {
+            using (var activeProject = _vbe.ActiveVBProject)
+            {
+                return activeProject.Name;
+            }
+        }
         private string GetFolder(CodeExplorerItemViewModel node)
         {
             switch (node)
             {
                 case null:
-                    return DefaultFolder;
+                    return GetActiveProjectName();
                 case ICodeExplorerDeclarationViewModel declarationNode:
                     return string.IsNullOrEmpty(declarationNode.Declaration.CustomFolder)
-                        ? DefaultFolder
+                        ? GetActiveProjectName()
                         : declarationNode.Declaration.CustomFolder.Replace("\"", string.Empty);
                 default:
                     return ((CodeExplorerCustomFolderViewModel)node).FullPath;
diff --git a/Rubberduck.Resources/Settings/AutoCompletesPage.de.resx b/Rubberduck.Resources/Settings/AutoCompletesPage.de.resx
index f1a063c905..639a3a27e2 100644
--- a/Rubberduck.Resources/Settings/AutoCompletesPage.de.resx
+++ b/Rubberduck.Resources/Settings/AutoCompletesPage.de.resx
@@ -118,69 +118,69 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="AutoCompleteClosingBraceDescription" xml:space="preserve">
-    <value>Close curly braces '{'</value>
+    <value>Schließe geschweifte Klammern '{'</value>
   </data>
   <data name="AutoCompleteClosingBracketDescription" xml:space="preserve">
-    <value>Close square brackets '['</value>
+    <value>Schließe eckige Klammern '['</value>
   </data>
   <data name="AutoCompleteClosingParentheseDescription" xml:space="preserve">
-    <value>Close parentheses '('</value>
+    <value>Schließe Klammern '('</value>
   </data>
   <data name="AutoCompleteClosingStringDescription" xml:space="preserve">
-    <value>Close string literals '"'</value>
+    <value>Schließe String-Zeichenketten '"'</value>
   </data>
   <data name="AutoCompleteDoBlockDescription" xml:space="preserve">
-    <value>Close 'Do [Until|While]...Loop' loop blocks</value>
+    <value>Schließe 'Do [Until|While]...Loop' Blöcke</value>
   </data>
   <data name="AutoCompleteEnumBlockDescription" xml:space="preserve">
-    <value>Close 'Enum' blocks</value>
+    <value>Schließe 'Enum' Blöcke</value>
   </data>
   <data name="AutoCompleteForBlockDescription" xml:space="preserve">
-    <value>Close 'For [Each]...Next' loop blocks</value>
+    <value>Schließe 'For [Each]...Next' Blöcke</value>
   </data>
   <data name="AutoCompleteIfBlockDescription" xml:space="preserve">
-    <value>Close 'If' blocks</value>
+    <value>Schließe 'If' Blöcke</value>
   </data>
   <data name="AutoCompleteOnErrorResumeNextBlockDescription" xml:space="preserve">
-    <value>Treat 'On Error Resume Next...GoTo 0' as a block</value>
+    <value>Behandele 'On Error Resume Next...GoTo 0' als Block</value>
   </data>
   <data name="AutoCompletePrecompilerIfBlockDescription" xml:space="preserve">
-    <value>Close precompiler '#If' blocks</value>
+    <value>Schließe Precompiler '#If' Blöcke</value>
   </data>
   <data name="AutoCompleteSelectBlockDescription" xml:space="preserve">
-    <value>Close 'Select' blocks</value>
+    <value>Schließe 'Select' Blöcke</value>
   </data>
   <data name="AutoCompleteTypeBlockDescription" xml:space="preserve">
-    <value>Close 'Type' blocks</value>
+    <value>Schließe 'Type' Blöcke</value>
   </data>
   <data name="AutoCompleteWhileBlockDescription" xml:space="preserve">
-    <value>Close 'While...Wend' loop blocks</value>
+    <value>Schließe 'While...Wend' Blöcke</value>
   </data>
   <data name="AutoCompleteWithBlockDescription" xml:space="preserve">
-    <value>Close 'With' blocks</value>
+    <value>Schließe 'With' Blöcke</value>
   </data>
   <data name="AutoCompleteSubBlockDescription" xml:space="preserve">
-    <value>Override 'Sub' member block completion</value>
+    <value>Überschreibe 'Sub' Vervollständigung der VBE</value>
   </data>
   <data name="AutoCompleteFunctionBlockDescription" xml:space="preserve">
-    <value>Override 'Function' member block completion</value>
+    <value>Überschreibe 'Function' Vervollständigung der VBE</value>
   </data>
   <data name="AutoCompletePropertyBlockDescription" xml:space="preserve">
-    <value>Override 'Property' member block completion</value>
+    <value>Überschreibe 'Property' Vervollständigung der VBE</value>
   </data>
   <data name="HandleTabKey" xml:space="preserve">
-    <value>Autocomplete blocks on TAB</value>
+    <value>Vervollständige Blöcke mit TAB</value>
   </data>
   <data name="HandleEnterKey" xml:space="preserve">
-    <value>Autocomplete blocks on ENTER</value>
+    <value>Vervollständige Blöcke mit ENTER</value>
   </data>
   <data name="PageHeader" xml:space="preserve">
-    <value>Autocompletion Settings</value>
+    <value>Einstellungen der automatischen Vervollständigung</value>
   </data>
   <data name="PageInstructions" xml:space="preserve">
-    <value>Configure which Rubberduck autocompletions are enabled.</value>
+    <value>Konfigurieren Sie, welche Rubberduck-Autokomplettierungen aktiviert sind.</value>
   </data>
   <data name="EnableSmartConcat" xml:space="preserve">
-    <value>Enable smart concatenation</value>
+    <value>Aktiviere intelligente Verkettung</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Settings/SettingsUI.de.resx b/Rubberduck.Resources/Settings/SettingsUI.de.resx
index bce933253f..d437ca7be3 100644
--- a/Rubberduck.Resources/Settings/SettingsUI.de.resx
+++ b/Rubberduck.Resources/Settings/SettingsUI.de.resx
@@ -126,6 +126,9 @@
   <data name="ImportPageSettingsButton" xml:space="preserve">
     <value>Importieren</value>
   </data>
+  <data name="PageHeader_AutoCompleteSettings" xml:space="preserve">
+    <value>Einstellungen der automatischen Vervollständigung</value>
+  </data>
   <data name="PageHeader_GeneralSettings" xml:space="preserve">
     <value>Allgemeine Einstellungen</value>
   </data>
@@ -145,7 +148,7 @@
     <value>Fenstereinstellungen</value>
   </data>
   <data name="PageInstructions_AutoCompleteSettings" xml:space="preserve">
-    <value>Configure which autocompletions are enabled.</value>
+    <value>Konfigurieren Sie, welche Autovervollständigungen aktiviert sind.</value>
   </data>
   <data name="PageInstructions_GeneralSettings" xml:space="preserve">
     <value>[Ok] zum Schließen und Speichern oder [Abbrechen] zum Verwerfen der Änderungen.</value>
@@ -169,7 +172,7 @@
     <value>Zurücksetzen</value>
   </data>
   <data name="SelectAll" xml:space="preserve">
-    <value>All</value>
+    <value>Alle</value>
   </data>
   <data name="Settings_Caption" xml:space="preserve">
     <value>Rubberduck Einstellungen</value>