--- a/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/control/Navigator.java	Tue Apr 07 11:28:37 2009 -0400
+++ b/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/control/Navigator.java	Tue Apr 07 14:58:59 2009 -0400
@@ -283,6 +283,7 @@
 
 	    List<Control> stopped = new ArrayList<Control>();
 	    List<Control> started = new ArrayList<Control>();
+	    boolean needStopEvent = false;
 
 	    try {
 		boolean done = false;
@@ -381,6 +382,7 @@
 			    roRPath);
 
 			fireNavigationStarted(event);
+			needStopEvent = true;
 
 			for (PendingControl pend : rPath) {
 			    Control curControl = getCurrentControl();
@@ -429,7 +431,7 @@
 		    }
 		}
 	    } finally {
-		if (!started.isEmpty() || !stopped.isEmpty()) {
+		if (needStopEvent) {
 		    NavigationEvent event = new NavigationEvent(this,
 			Collections.unmodifiableList(stopped),
 			Collections.unmodifiableList(started));