diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/methods.py b/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/methods.py
index 83e86d0178..128c77b7c0 100644
--- a/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/methods.py
+++ b/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/methods.py
@@ -425,10 +425,10 @@ def connect(inferior: sch.Schema('Inferior'), spec: str):
     gdb.execute(f'target {spec}')
 
 
-@REGISTRY.method(action='attach', display='Attach by Available')
-def attach_obj(inferior: sch.Schema('Inferior'), target: sch.Schema('Attachable')):
+@REGISTRY.method(action='attach', display='Attach')
+def attach_obj(target: sch.Schema('Attachable')):
     """Attach the inferior to the given target."""
-    switch_inferior(find_inf_by_obj(inferior))
+    #switch_inferior(find_inf_by_obj(inferior))
     pid = find_availpid_by_obj(target)
     gdb.execute(f'attach {pid}')
 
diff --git a/GhidraDocs/GhidraClass/Debugger/A1-GettingStarted.html b/GhidraDocs/GhidraClass/Debugger/A1-GettingStarted.html
index 77af0e12a4..b0b3da0890 100644
--- a/GhidraDocs/GhidraClass/Debugger/A1-GettingStarted.html
+++ b/GhidraDocs/GhidraClass/Debugger/A1-GettingStarted.html
@@ -457,7 +457,7 @@ the system’s copy of GDB. Probably, you can just click
 <li>In the <strong>Model</strong> window (to the left), expand the
 <em>Available</em> node.</li>
 <li>In the filter box, type <code>termmines</code>.</li>
-<li>Note the PID, e.g. 1234, then in the <strong>Terminal</strong> type,
+<li>Right click on the node and select <strong>Attach</strong>, or, if you prefer, note the PID, e.g. 1234, then in the <strong>Terminal</strong> type,
 e.g., <code>attach 1234</code>.</li>
 </ol>
 </section>
diff --git a/GhidraDocs/GhidraClass/Debugger/A1-GettingStarted.md b/GhidraDocs/GhidraClass/Debugger/A1-GettingStarted.md
index 6085fd1d9c..7616c92af6 100644
--- a/GhidraDocs/GhidraClass/Debugger/A1-GettingStarted.md
+++ b/GhidraDocs/GhidraClass/Debugger/A1-GettingStarted.md
@@ -221,7 +221,7 @@ Note this technique is only possible because the target waits for input.
    Probably, you can just click **Launch**.
 1. In the **Model** window (to the left), expand the *Available* node.
 1. In the filter box, type `termmines`.
-1. Note the PID, e.g. 1234, then in the **Terminal** type, e.g., `attach 1234`.
+1. Right click on the node and select **Attach**, or, if you prefer, note the PID, e.g. 1234, then in the **Terminal** type, e.g., `attach 1234`.
 
 ## Exercise: Attach