Visual Studio Tools Window Focus

[Borvik]

I'm rebuilding one of our plugins for GP 2013 (adding some new features as well), and I'm running into a difficulty.

I'm using VSTM to add a menu item to Inquiry -> Sales (working) - then using that menu item to open a new form (VS form).

Here is the code I'm using to open the new form (using Show vs. ShowDialog to allow the user to still access other GP forms).

Forms.TrxHistory f = new Forms.TrxHistory();
f.Show();
f.Activate();

On that form I have some payments displayed in a grid - with the payment number a link that is opened using the following:

Microsoft.Dexterity.Applications.Dynamics.Forms.RmCashInquiry.Procedures.OpenWindow.Invoke

The RmCashInquiry window is indeed opening, however if I close the window the focus then returns to the GP main window, rather than the TrxHistory window that spawned it.

Anyone have any ideas?

Thanks.