Restore mouse behavior (closes #441)