diff --git a/CodeNav.Shared/Controls/ItemDataTemplate.xaml b/CodeNav.Shared/Controls/ItemDataTemplate.xaml
index cd5a132..513dead 100644
--- a/CodeNav.Shared/Controls/ItemDataTemplate.xaml
+++ b/CodeNav.Shared/Controls/ItemDataTemplate.xaml
@@ -8,8 +8,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <DataTemplate DataType="{x:Type models:CodeItem}">
-        <Button Command="{Binding Path=ClickItemCommand}" CommandParameter="{Binding StartLinePosition}" 
-                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" 
+        <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" 
                 ContextMenu="{StaticResource ItemContextMenu}"
                 BorderThickness="0" 
                 HorizontalContentAlignment="Stretch"
@@ -19,6 +18,16 @@
                 Margin="-3"
                 Opacity="{Binding Opacity}">
 
+            <Button.InputBindings>
+                <MouseBinding
+                    Gesture="LeftClick"
+                    Command="{Binding Path=ClickItemCommand}"
+                    CommandParameter="{Binding StartLinePosition}" />
+                <MouseBinding
+                    Gesture="LeftDoubleClick"
+                    Command="{Binding Path=EditLineCommand}" />
+            </Button.InputBindings>
+
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
diff --git a/CodeNav.Shared/Helpers/DocumentHelper.cs b/CodeNav.Shared/Helpers/DocumentHelper.cs
index adf0806..b7c665b 100644
--- a/CodeNav.Shared/Helpers/DocumentHelper.cs
+++ b/CodeNav.Shared/Helpers/DocumentHelper.cs
@@ -15,6 +15,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Controls;
+using System.Windows.Forms;
 using Task = System.Threading.Tasks.Task;
 
 namespace CodeNav.Helpers
@@ -128,6 +129,39 @@ public static async Task ScrollToLine(LinePosition? linePosition, string filePat
             }
         }
 
+        public static async Task EditLine(LinePosition? linePosition, string filePath = "")
+        {
+            if (linePosition == null)
+            {
+                return;
+            }
+
+            try
+            {
+                var documentView = await VS.Documents.GetActiveDocumentViewAsync();
+
+                if (documentView?.FilePath != filePath)
+                {
+                    documentView = await VS.Documents.OpenInPreviewTabAsync(filePath);
+                }
+
+                if (documentView?.TextBuffer == null ||
+                    documentView?.TextView == null)
+                {
+                    return;
+                }
+
+                var line = documentView.TextView.TextSnapshot.GetLineFromLineNumber(linePosition.Value.Line);
+                var point = new SnapshotPoint(line.Snapshot, line.Start.Position + linePosition.Value.Character);
+
+                documentView.TextView.Caret.MoveTo(point);
+            }
+            catch (Exception)
+            {
+                // Ignore
+            }
+        }
+
         public static async Task SelectLines(TextSpan textSpan)
         {
             try
diff --git a/CodeNav.Shared/Mappers/BaseMapper.cs b/CodeNav.Shared/Mappers/BaseMapper.cs
index 45a1a56..4c733cd 100644
--- a/CodeNav.Shared/Mappers/BaseMapper.cs
+++ b/CodeNav.Shared/Mappers/BaseMapper.cs
@@ -91,6 +91,12 @@ public static LinePosition GetStartLinePosition(SyntaxToken identifier) =>
         public static int GetStartLine(SyntaxToken identifier) =>
             GetStartLinePosition(identifier).Line + 1;
 
+        public static LinePosition GetStartLinePosition(SyntaxNode source, SyntaxTokenList modifiers) =>
+            source.SyntaxTree.GetLineSpan(modifiers.Span).StartLinePosition;
+
+        public static int GetStartLine(SyntaxNode source, SyntaxTokenList modifiers) =>
+            GetStartLinePosition(source, modifiers).Line + 1;
+
         private static CodeItemAccessEnum MapAccess(SyntaxTokenList modifiers, SyntaxNode source)
         {
             if (modifiers.Any(m => m.RawKind == (int)SyntaxKind.SealedKeyword ||
diff --git a/CodeNav.Shared/Mappers/MethodMapper.cs b/CodeNav.Shared/Mappers/MethodMapper.cs
index e2b37a3..fcf2554 100644
--- a/CodeNav.Shared/Mappers/MethodMapper.cs
+++ b/CodeNav.Shared/Mappers/MethodMapper.cs
@@ -70,8 +70,8 @@ public static class MethodMapper
             item.Id = IdMapper.MapId(item.FullName, parameterList);
             item.Kind = kind;
             item.Moniker = IconMapper.MapMoniker(item.Kind, item.Access);
-            item.StartLine = BaseMapper.GetStartLine(identifier);
-            item.StartLinePosition = BaseMapper.GetStartLinePosition(identifier);
+            item.StartLine = BaseMapper.GetStartLine(node, modifiers);
+            item.StartLinePosition = BaseMapper.GetStartLinePosition(node, modifiers);
 
             if (TriviaSummaryMapper.HasSummary(node) && SettingsHelper.UseXMLComments)
             {
diff --git a/CodeNav.Shared/Models/CodeItem.cs b/CodeNav.Shared/Models/CodeItem.cs
index aa0abc0..8b0ffc4 100644
--- a/CodeNav.Shared/Models/CodeItem.cs
+++ b/CodeNav.Shared/Models/CodeItem.cs
@@ -14,7 +14,6 @@
 using System.Runtime.Serialization;
 using Task = System.Threading.Tasks.Task;
 using Microsoft.VisualStudio.Shell;
-using System.Threading;
 
 namespace CodeNav.Models
 {
@@ -230,6 +229,13 @@ private async Task ClickItemAsync()
         public ICommand SelectInCodeCommand => new DelegateCommand(SelectInCode);
         public void SelectInCode(object args) => DocumentHelper.SelectLines(Span).FireAndForget();
 
+        public ICommand EditLineCommand => new DelegateCommand(EditLine);
+        public void EditLine(object args)
+        {
+            IsDoubleClicked = true;
+            DocumentHelper.EditLine(StartLinePosition, FilePath).FireAndForget();
+        }
+
         public ICommand CopyNameCommand => new DelegateCommand(CopyName);
         public void CopyName(object args) => Clipboard.SetText(Name);
 
diff --git a/CodeNav.Shared/Styles/PlusMinusExpanderStyles.xaml b/CodeNav.Shared/Styles/PlusMinusExpanderStyles.xaml
index 8804641..e8d0a43 100644
--- a/CodeNav.Shared/Styles/PlusMinusExpanderStyles.xaml
+++ b/CodeNav.Shared/Styles/PlusMinusExpanderStyles.xaml
@@ -88,14 +88,13 @@
                                             BorderThickness="0"
                                             Margin="4,0,0,0">
                                         <Button.InputBindings>
-
-                                            <MouseBinding
-                                                Gesture="LeftDoubleClick"
-                                                Command="{Binding Path=ToggleIsExpandedCommand}" />
                                             <MouseBinding
                                                 Gesture="LeftClick"
                                                 Command="{Binding Path=ClickItemCommand}"
                                                 CommandParameter="{Binding StartLinePosition}" />
+                                            <MouseBinding
+                                                Gesture="LeftDoubleClick"
+                                                Command="{Binding Path=ToggleIsExpandedCommand}" />
                                         </Button.InputBindings>
                                     </Button>
                                 </Border>