diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerCustomFolderViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerCustomFolderViewModel.cs
index 2b59367af7..ebcac8b37c 100644
--- a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerCustomFolderViewModel.cs
+++ b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerCustomFolderViewModel.cs
@@ -11,6 +11,7 @@ namespace Rubberduck.Navigation.CodeExplorer
     public class CodeExplorerCustomFolderViewModel : CodeExplorerItemViewModel
     {
         private readonly string _name;
+        private readonly string _folderAttribute;
         private static readonly DeclarationType[] ComponentTypes =
         {
             DeclarationType.ClassModule, 
@@ -19,9 +20,10 @@ public class CodeExplorerCustomFolderViewModel : CodeExplorerItemViewModel
             DeclarationType.UserForm, 
         };
 
-        public CodeExplorerCustomFolderViewModel(string name, IEnumerable<Declaration> declarations)
+        public CodeExplorerCustomFolderViewModel(string name, string fullPath, IEnumerable<Declaration> declarations)
         {
-            _name = name;
+            _name = name.Replace("\"", string.Empty);
+            _folderAttribute = string.Format("@Folder(\"{0}\")", fullPath.Replace("\"", string.Empty));
 
             _collapsedIcon = GetImageSource(resx.folder_horizontal);
             _expandedIcon = GetImageSource(resx.folder_horizontal_open);
@@ -48,6 +50,8 @@ public CodeExplorerCustomFolderViewModel(string name, IEnumerable<Declaration> d
             }
         }
 
+        public string FolderAttribute { get { return _folderAttribute; } }
+
         public override string Name { get { return _name; } }
         public override string NameWithSignature { get { return Name; } }
 
diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerProjectViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerProjectViewModel.cs
index 722570cfbb..26e83f29e8 100644
--- a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerProjectViewModel.cs
+++ b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerProjectViewModel.cs
@@ -43,7 +43,7 @@ public CodeExplorerProjectViewModel(Declaration declaration, IEnumerable<Declara
 
         private static IEnumerable<CodeExplorerItemViewModel> FindFolders(IEnumerable<Declaration> declarations, char delimiter)
         {
-            var root = new CodeExplorerCustomFolderViewModel(string.Empty, new List<Declaration>());
+            var root = new CodeExplorerCustomFolderViewModel(string.Empty, string.Empty, new List<Declaration>());
 
             var items = declarations.ToList();
             var folders = items.Where(item => ComponentTypes.Contains(item.DeclarationType))
@@ -68,7 +68,7 @@ private static IEnumerable<CodeExplorerItemViewModel> FindFolders(IEnumerable<De
                         var currentPath = path.ToString();
                         var parents = grouping.Where(item => ComponentTypes.Contains(item.DeclarationType) && item.CustomFolder == currentPath).ToList();
 
-                        next = new CodeExplorerCustomFolderViewModel(part, items.Where(item => 
+                        next = new CodeExplorerCustomFolderViewModel(part, currentPath, items.Where(item => 
                             parents.Contains(item) || parents.Any(parent => 
                                 (item.ParentDeclaration != null && item.ParentDeclaration.Equals(parent)) || item.ComponentName == parent.ComponentName)));
                         node.AddChild(next);
diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs
index 5dba572a25..07de4e4508 100644
--- a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs
+++ b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs
@@ -21,6 +21,8 @@ public class CodeExplorerViewModel : ViewModelBase
     {
         private readonly VBE _vbe;
         private readonly RubberduckParserState _state;
+        private readonly NewUnitTestModuleCommand _newUnitTestModuleCommand;
+        private readonly Indenter _indenter;
         private readonly ICodePaneWrapperFactory _wrapperFactory;
         private readonly FindAllReferencesCommand _findAllReferences;
 
@@ -34,7 +36,6 @@ public CodeExplorerViewModel(VBE vbe,
         {
             _vbe = vbe;
             _state = state;
-            _navigateCommand = navigateCommand;
             _newUnitTestModuleCommand = newUnitTestModuleCommand;
             _indenter = indenter;
             _wrapperFactory = wrapperFactory;
@@ -42,13 +43,15 @@ public CodeExplorerViewModel(VBE vbe,
             _state.StateChanged += ParserState_StateChanged;
             _state.ModuleStateChanged += ParserState_ModuleStateChanged;
 
-            _refreshCommand = new DelegateCommand(ExecuteRefreshCommand);
+            _navigateCommand = navigateCommand;
+            _contextMenuNavigateCommand = new DelegateCommand(ExecuteContextMenuNavigateCommand, CanExecuteContextMenuNavigateCommand);
+            _refreshCommand = new DelegateCommand(ExecuteRefreshCommand, _ => CanRefresh);
             _addTestModuleCommand = new DelegateCommand(ExecuteAddTestModuleCommand);
             _addStdModuleCommand = new DelegateCommand(ExecuteAddStdModuleCommand, CanAddModule);
             _addClsModuleCommand = new DelegateCommand(ExecuteAddClsModuleCommand, CanAddModule);
             _addFormCommand = new DelegateCommand(ExecuteAddFormCommand, CanAddModule);
-            _indenterCommand = new DelegateCommand(ExecuteIndenterCommand);
-            _renameCommand = new DelegateCommand(ExecuteRenameCommand);
+            _indenterCommand = new DelegateCommand(ExecuteIndenterCommand, _ => CanExecuteIndenterCommand);
+            _renameCommand = new DelegateCommand(ExecuteRenameCommand, _ => CanExecuteRenameCommand);
             _findAllReferencesCommand = new DelegateCommand(ExecuteFindAllReferencesCommand);
         }
 
@@ -77,10 +80,39 @@ public CodeExplorerViewModel(VBE vbe,
         public ICommand FindAllReferencesCommand { get { return _findAllReferencesCommand; } }
 
         private readonly INavigateCommand _navigateCommand;
-        private readonly NewUnitTestModuleCommand _newUnitTestModuleCommand;
-        private readonly Indenter _indenter;
         public ICommand NavigateCommand { get { return _navigateCommand; } }
 
+        private readonly ICommand _contextMenuNavigateCommand;
+        public ICommand ContextMenuNavigateCommand { get { return _contextMenuNavigateCommand; } }
+
+        public string Description
+        {
+            get
+            {
+                if (SelectedItem is CodeExplorerProjectViewModel)
+                {
+                    return ((CodeExplorerProjectViewModel)SelectedItem).Declaration.DescriptionString;
+                }
+
+                if (SelectedItem is CodeExplorerComponentViewModel)
+                {
+                    return ((CodeExplorerComponentViewModel)SelectedItem).Declaration.DescriptionString;
+                }
+
+                if (SelectedItem is CodeExplorerMemberViewModel)
+                {
+                    return ((CodeExplorerMemberViewModel)SelectedItem).Declaration.DescriptionString;
+                }
+
+                if (SelectedItem is CodeExplorerCustomFolderViewModel)
+                {
+                    return ((CodeExplorerCustomFolderViewModel)SelectedItem).FolderAttribute;
+                }
+
+                return string.Empty;
+            }
+        }
+
         private CodeExplorerItemViewModel _selectedItem;
         public CodeExplorerItemViewModel SelectedItem
         {
@@ -92,6 +124,7 @@ public CodeExplorerItemViewModel SelectedItem
                 OnPropertyChanged("CanExecuteIndenterCommand");
                 OnPropertyChanged("CanExecuteRenameCommand");
                 OnPropertyChanged("CanExecuteFindAllReferencesCommand");
+                OnPropertyChanged("Description");
             }
         }
 
@@ -124,6 +157,11 @@ private bool CanAddModule(object param)
             return _vbe.ActiveVBProject != null;
         }
 
+        private bool CanExecuteContextMenuNavigateCommand(object param)
+        {
+            return SelectedItem != null && SelectedItem.QualifiedSelection.HasValue;
+        }
+
         public bool CanExecuteIndenterCommand
         {
             get
@@ -267,21 +305,20 @@ private void ExecuteAddFormCommand(object param)
 
         private void ExecuteIndenterCommand(object param)
         {
+            if (!SelectedItem.QualifiedSelection.HasValue)
+            {
+                return;
+            }
+
             Debug.WriteLine("CodeExplorerViewModel.IndenterCommand");
             if (SelectedItem is CodeExplorerProjectViewModel)
             {
-                if (SelectedItem.QualifiedSelection.HasValue)
-                {
-                    _indenter.Indent(SelectedItem.QualifiedSelection.Value.QualifiedName.Project);
-                }
+                _indenter.Indent(SelectedItem.QualifiedSelection.Value.QualifiedName.Project);
             }
 
             if (SelectedItem is CodeExplorerComponentViewModel)
             {
-                if (SelectedItem.QualifiedSelection.HasValue)
-                {
-                    _indenter.Indent(SelectedItem.QualifiedSelection.Value.QualifiedName.Component);
-                }
+                _indenter.Indent(SelectedItem.QualifiedSelection.Value.QualifiedName.Component);
             }
         }
 
@@ -301,6 +338,15 @@ private void ExecuteFindAllReferencesCommand(object obj)
             _findAllReferences.Execute(GetSelectedDeclaration());
         }
 
+        private void ExecuteContextMenuNavigateCommand(object obj)
+        {
+            // ReSharper disable once PossibleInvalidOperationException
+            // CanExecute protects against this
+            var arg = new NavigateCodeEventArgs(SelectedItem.QualifiedSelection.Value);
+
+            NavigateCommand.Execute(arg);
+        }
+
         private Declaration GetSelectedDeclaration()
         {
             if (SelectedItem is CodeExplorerProjectViewModel)
diff --git a/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml b/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml
index 5abd2b04a2..b302248e6a 100644
--- a/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml
+++ b/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml
@@ -10,14 +10,14 @@
              xmlns:themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
              ResxExtension.DefaultResxName="Rubberduck.UI.RubberduckUI" 
              Language="{UICulture}"
+             Name="CodeExplorer"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300" d:DataContext="{d:DesignInstance codeExplorer:CodeExplorerViewModel}">
     <UserControl.Resources>
-
         <BooleanToVisibilityConverter x:Key="BoolToVisibility"/>
         <converter:BoolToHiddenVisibility x:Key="BoolToHiddenVisibility" />
 
-            <Style x:Key="LinkButton" TargetType="Button" BasedOn="{StaticResource ResourceKey={x:Type Button}}">
+        <Style x:Key="LinkButton" TargetType="Button" BasedOn="{StaticResource ResourceKey={x:Type Button}}">
 
             <Setter Property="Width" Value="Auto"/>
 
@@ -63,6 +63,34 @@
                TargetType="{x:Type TreeViewItem}">
             <Setter Property="BorderThickness" Value="1.5"/>
             <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
+            <Setter Property="ContextMenu">
+                <Setter.Value>
+                    <ContextMenu DataContext="{Binding DataContext, Source={x:Reference CodeExplorer}}">
+                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Refresh}"
+                                  Command="{Binding RefreshCommand}">
+                            <MenuItem.Icon>
+                                <Image Source="../../Resources/arrow-circle-double.png" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                        <Separator />
+                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Rename}"
+                                  Command="{Binding RenameCommand}" />
+                        <Separator />
+                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Navigate}"
+                                  Command="{Binding ContextMenuNavigateCommand}" />
+                        <Separator />
+                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_ContextMenu_AddTestModuleText}"
+                                  Command="{Binding AddTestModuleCommand}" />
+                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_ContextMenu_AddStdModuleText}"
+                                  Command="{Binding AddStdModuleCommand}" />
+                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_ContextMenu_AddClassModuleText}"
+                                  Command="{Binding AddClsModuleCommand}" />
+                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_ContextMenu_AddFormText}"
+                                  Command="{Binding AddFormCommand}" />
+                    </ContextMenu>
+                </Setter.Value>
+            </Setter>
+            <EventSetter Event="PreviewMouseRightButtonDown" Handler="OnPreviewMouseRightButtonDown" />
             <Style.Triggers>
                 <Trigger Property="IsSelected" Value="True">
                     <Setter Property="BorderBrush" Value="#adc6e5"/>
@@ -81,7 +109,6 @@
                 </Style>
             </Style.Resources>
         </Style>
-
         
         <Style x:Key="IconStyle" TargetType="Image">
             <Setter Property="Height" Value="16" />
@@ -379,20 +406,18 @@
         <GridSplitter Grid.Row="2" Height="5" ShowsPreview="True" Cursor="SizeNS" HorizontalAlignment="Stretch"/>
 
         <Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="DimGray">
-            
-            <Grid Background="Gainsboro">
-                
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
 
-                <StackPanel Orientation="Vertical">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
-                    </StackPanel>
+            <StackPanel Orientation="Vertical" MinHeight="48" Background="Gainsboro">
+
+                <StackPanel Margin="4" Orientation="Horizontal" HorizontalAlignment="Stretch">
+                    <Image Style="{StaticResource IconStyle}" VerticalAlignment="Center" 
+                           Source="{Binding SelectedItem.CollapsedIcon}"/>
+                    <TextBlock Margin="4" Text="{Binding SelectedItem.NameWithSignature}" FontWeight="Bold" TextWrapping="WrapWithOverflow"/>
                 </StackPanel>
-                
-                <WrapPanel Grid.Column="0" Grid.Row="1">
+
+                <TextBlock Margin="4" Text="{Binding Description}" FontSize="10" TextWrapping="WrapWithOverflow"/>
+
+                <WrapPanel>
                     <Button Style="{StaticResource LinkButton}" Margin="4"
                             Visibility="{Binding CanExecuteIndenterCommand, Converter={StaticResource BoolToVisibility}, UpdateSourceTrigger=PropertyChanged}"
                             Command="{Binding IndenterCommand}"
@@ -406,7 +431,7 @@
                             Command="{Binding FindAllReferencesCommand}"
                             Content="Find All References" />
                 </WrapPanel>
-            </Grid>
+            </StackPanel>
         </Border>
 
     </Grid>
diff --git a/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml.cs b/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml.cs
index e338261bef..bf513a012d 100644
--- a/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml.cs
+++ b/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml.cs
@@ -32,5 +32,10 @@ private void TreeView_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
             var arg = selectedResult.QualifiedSelection.Value.GetNavitationArgs();
             ViewModel.NavigateCommand.Execute(arg);
         }
+
+        private void OnPreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            ((TreeViewItem)sender).IsSelected = true;
+        }
     }
 }
diff --git a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
index fd154e7d48..7d2d24cd8e 100644
--- a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
+++ b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
@@ -244,6 +244,42 @@ public static string CodeExplorer_AddTestModuleText {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Add Class module (.cls).
+        /// </summary>
+        public static string CodeExplorer_ContextMenu_AddClassModuleText {
+            get {
+                return ResourceManager.GetString("CodeExplorer_ContextMenu_AddClassModuleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add User form (.frm).
+        /// </summary>
+        public static string CodeExplorer_ContextMenu_AddFormText {
+            get {
+                return ResourceManager.GetString("CodeExplorer_ContextMenu_AddFormText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add Standard module (.bas).
+        /// </summary>
+        public static string CodeExplorer_ContextMenu_AddStdModuleText {
+            get {
+                return ResourceManager.GetString("CodeExplorer_ContextMenu_AddStdModuleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add Test module.
+        /// </summary>
+        public static string CodeExplorer_ContextMenu_AddTestModuleText {
+            get {
+                return ResourceManager.GetString("CodeExplorer_ContextMenu_AddTestModuleText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Display member &amp;names.
         /// </summary>
diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx
index 8412928ab4..24678330b5 100644
--- a/RetailCoder.VBE/UI/RubberduckUI.resx
+++ b/RetailCoder.VBE/UI/RubberduckUI.resx
@@ -1509,4 +1509,16 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
   <data name="CodeExplorer_ShowSignaturesToolTip" xml:space="preserve">
     <value>Toggle signatures</value>
   </data>
+  <data name="CodeExplorer_ContextMenu_AddClassModuleText" xml:space="preserve">
+    <value>Add Class module (.cls)</value>
+  </data>
+  <data name="CodeExplorer_ContextMenu_AddFormText" xml:space="preserve">
+    <value>Add User form (.frm)</value>
+  </data>
+  <data name="CodeExplorer_ContextMenu_AddStdModuleText" xml:space="preserve">
+    <value>Add Standard module (.bas)</value>
+  </data>
+  <data name="CodeExplorer_ContextMenu_AddTestModuleText" xml:space="preserve">
+    <value>Add Test module</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Parsing/Symbols/Declaration.cs b/Rubberduck.Parsing/Symbols/Declaration.cs
index 56ee1e16e5..e4a153f1a0 100644
--- a/Rubberduck.Parsing/Symbols/Declaration.cs
+++ b/Rubberduck.Parsing/Symbols/Declaration.cs
@@ -216,7 +216,7 @@ public bool IsDefaultMember
             get
             {
                 IEnumerable<string> value;
-                if (_attributes.TryGetValue(IdentifierName + ".VB_UserMemId", out value))
+                if (_attributes.TryGetValue("VB_UserMemId", out value))
                 {
                     return value.Single() == "0";
                 }
@@ -233,7 +233,7 @@ public string DescriptionString
             get
             {
                 IEnumerable<string> value;
-                if (_attributes.TryGetValue(IdentifierName + ".VB_Description", out value))
+                if (_attributes.TryGetValue("VB_Description", out value))
                 {
                     return value.Single();
                 }
@@ -251,7 +251,7 @@ public bool IsEnumeratorMember
             get
             {
                 IEnumerable<string> value;
-                if (_attributes.TryGetValue(IdentifierName + ".VB_UserMemId", out value))
+                if (_attributes.TryGetValue("VB_UserMemId", out value))
                 {
                     return value.Single() == "-4";
                 }