I usually only pull them out for battles, anyway.

[But... still, that doesn't fix it.]

Keeping them locked up won't change their behavior, though. Heck, it probably just makes things worse.