             // handle default button here
             // we can't check for Button because of cross-versioning so
             // for now we just check for an emphasized property
-            if (_lastFocus is IButton)
+            if (_lastFocus is IButton && !(_lastFocus is IToggleButton))
             {
                 defButton = _lastFocus as IButton;
             }

        {
            if (_defaultButton)
            {
                if (target is IButton && target != _defaultButton)
                    _defaultButton.emphasized = false;
                else 
                    _defaultButton.emphasized = true;

                defButton.emphasized = false;
            
            _defaultButton = button;
            
            if (defButton != _lastFocus)
            {
                defButton = button;
            
                if (button)
                    button.emphasized = true;
            }
        }
    }

