diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index b0caed64283..6531533c732 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-17 Mikhail Khodjaiants
+	Added the handlers for the 'Create' and 'Terminate' events to the 'Shared Libraries' view.
+	* SharedLibrariesViewEventHandler.java
+
 2003-01-17 Mikhail Khodjaiants
 	Implementation of the shared library view.
 	* LoadSymbolsActionDelegate.java
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/sharedlibs/SharedLibrariesViewEventHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/sharedlibs/SharedLibrariesViewEventHandler.java
index 6cc564dc6f7..07264633e5a 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/sharedlibs/SharedLibrariesViewEventHandler.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/sharedlibs/SharedLibrariesViewEventHandler.java
@@ -9,6 +9,7 @@ import org.eclipse.cdt.debug.core.model.ICSharedLibrary;
 import org.eclipse.debug.core.DebugEvent;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.IDebugEventSetListener;
+import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.ui.AbstractDebugView;
 import org.eclipse.jface.viewers.TableViewer;
 
@@ -65,18 +66,18 @@ public class SharedLibrariesViewEventHandler implements IDebugEventSetListener
 		for( int i = 0; i < events.length; i++ )
 		{
 			DebugEvent event = events[i];
-			if ( event.getSource() instanceof ICSharedLibrary )
+			switch( event.getKind() )
 			{
-				switch( event.getKind() )
-				{
-					case DebugEvent.CREATE:
-					case DebugEvent.TERMINATE:
+				case DebugEvent.CREATE:
+				case DebugEvent.TERMINATE:
+					if ( event.getSource() instanceof IDebugTarget ||
+						 event.getSource() instanceof ICSharedLibrary )
 						refresh();
-						break;
-					case DebugEvent.CHANGE :
+					break;
+				case DebugEvent.CHANGE :
+					if ( event.getSource() instanceof ICSharedLibrary )
 						refresh( event.getSource() );
-						break;
-				}
+					break;
 			}
 		}
 	}