diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 9e5424b..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-### Description
-[Description of the bug or feature]
-
-### Steps to reproduce
-1. [First Step]
-2. [Second Step]
-3. [and so on...]
-
-**Expected behavior:** [What you expected to happen]
-
-**Actual behavior:** [What actually happened]
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..160740e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..11fc491
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/src/Editor/DropdownBars.cs b/src/Editor/DropdownBars.cs
index e2f9a65..8d91b60 100644
--- a/src/Editor/DropdownBars.cs
+++ b/src/Editor/DropdownBars.cs
@@ -16,18 +16,26 @@ internal class DropdownBars : TypeAndMemberDropdownBars, IDisposable
         private bool _disposed;
         private bool _bufferHasChanged;
 
-        public DropdownBars(IVsTextView textView, LanguageService languageService)
-            : base(languageService)
+        public DropdownBars(IVsTextView textView, LanguageService languageService) : base(languageService)
         {
             _languageService = languageService;
-
             _textView = textView.ToIWpfTextView();
-            _textView.Caret.PositionChanged += CaretPositionChanged;
-
             _document = _textView.TextBuffer.GetDocument();
             _document.Processed += OnDocumentProcessed;
 
-            //SynchronizeDropdowns();
+            InitializeAsync(textView).FireAndForget();
+        }
+
+        // This moves the caret to trigger initial drop down load
+        private Task InitializeAsync(IVsTextView textView)
+        {
+            return ThreadHelper.JoinableTaskFactory.StartOnIdle(() =>
+            {
+                textView.SendExplicitFocus();
+                _textView.Caret.MoveToNextCaretPosition();
+                _textView.Caret.PositionChanged += CaretPositionChanged;
+                _textView.Caret.MoveToPreviousCaretPosition();
+            }).Task;
         }
 
         private void CaretPositionChanged(object sender, CaretPositionChangedEventArgs e) => SynchronizeDropdowns();
@@ -46,10 +54,7 @@ private void SynchronizeDropdowns()
 
             _ = ThreadHelper.JoinableTaskFactory.StartOnIdle(() =>
             {
-                if (!_document.IsProcessing)
-                {
-                    _languageService.SynchronizeDropdowns();
-                }
+                _languageService.SynchronizeDropdowns();
             }, VsTaskRunContext.UIThreadIdlePriority);
         }
 
diff --git a/src/PkgdefLanguage.csproj b/src/PkgdefLanguage.csproj
index cd6365f..967927c 100644
--- a/src/PkgdefLanguage.csproj
+++ b/src/PkgdefLanguage.csproj
@@ -70,11 +70,11 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Community.VisualStudio.Toolkit.16" version="16.0.385" ExcludeAssets="runtime">
+    <PackageReference Include="Community.VisualStudio.Toolkit.16" version="16.0.394" ExcludeAssets="runtime">
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.BuildTools">
-      <Version>17.0.5232</Version>
+      <Version>17.0.5234</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/test/PkgdefLanguage.Test.csproj b/test/PkgdefLanguage.Test.csproj
index a42809c..90a1807 100644
--- a/test/PkgdefLanguage.Test.csproj
+++ b/test/PkgdefLanguage.Test.csproj
@@ -7,7 +7,7 @@
       <Compile Remove="C:\Users\madsk\.nuget\packages\community.visualstudio.toolkit.16\16.0.357\build\AssemblyInfo.cs" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Community.VisualStudio.Toolkit.16" Version="16.0.385" />
+        <PackageReference Include="Community.VisualStudio.Toolkit.16" Version="16.0.394" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
         <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />