diff --git a/dotnet-desktop-guide/framework/winforms/controls/walkthrough-debugging-custom-windows-forms-controls-at-design-time.md b/dotnet-desktop-guide/framework/winforms/controls/walkthrough-debugging-custom-windows-forms-controls-at-design-time.md
index 6fbb3b6..675840a 100644
--- a/dotnet-desktop-guide/framework/winforms/controls/walkthrough-debugging-custom-windows-forms-controls-at-design-time.md
+++ b/dotnet-desktop-guide/framework/winforms/controls/walkthrough-debugging-custom-windows-forms-controls-at-design-time.md
@@ -124,6 +124,9 @@ Now you are ready to debug your custom control as it runs in design mode. When y
 
 3. In the new instance of Visual Studio, open the "DebuggingExample" solution. You can easily find the solution by selecting **Recent Projects** from the **File** menu. The "DebuggingExample.sln" solution file will be listed as the most recently used file.
 
+   > [!IMPORTANT]
+   > If you're debugging a .NET 5 (.NET Core 3.1) or later Windows Forms project, use this instance of Visual Studio to attach a debugger to the the *DesignToolsServer.exe* process. Select the **Debug** > **Attach to process** menu item. Find *DesignToolsServer.exe* in the list of processes and press **Attach**.
+
 4. Open Form1 in the **Forms Designer** and select the **DebugControl** control.
 
 5. Change the value of the `DemoString` property. When you commit the change, the debugging instance of Visual Studio acquires focus and execution stops at your breakpoint. You can single-step through the property accessor just as your would any other code.
diff --git a/dotnet-desktop-guide/net/wpf/index.yml b/dotnet-desktop-guide/net/wpf/index.yml
index 9ef16ac..48c3f90 100644
--- a/dotnet-desktop-guide/net/wpf/index.yml
+++ b/dotnet-desktop-guide/net/wpf/index.yml
@@ -51,7 +51,7 @@ landingContent:
           - text: Open a common dialog box
             url: windows/how-to-open-common-system-dialog-box.md
           - text: Get or set the main app window
-            url: windows/how-to-open-common-system-dialog-box.md
+            url: windows/how-to-get-set-main-application-window.md
 
   - title: Control styles and templates
     linkLists: