diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbAdapterFactory.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbAdapterFactory.java
index 3cc223c802d..393e82757d0 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbAdapterFactory.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbAdapterFactory.java
@@ -221,6 +221,7 @@ public class GdbAdapterFactory
             DsfSession session = fLaunch.getSession();
             
             fViewModelAdapter.dispose();
+            session.unregisterModelAdapter(IViewerInputProvider.class);
 
             session.unregisterModelAdapter(ISourceDisplay.class);
             if (fSourceDisplayAdapter != null) fSourceDisplayAdapter.dispose();
@@ -252,6 +253,9 @@ public class GdbAdapterFactory
             session.unregisterModelAdapter(ISelectNextTraceRecordHandler.class);
             session.unregisterModelAdapter(ISelectPrevTraceRecordHandler.class);
 
+            session.unregisterModelAdapter(IDebugModelProvider.class);
+            session.unregisterModelAdapter(ILaunch.class);
+
             session.unregisterModelAdapter(ICEditorTextHover.class);
 
             fSteppingModeTarget.dispose();