Yes, that makes sense.

I just saw it again, and one slightly odd thing in the final scene is the way gun-hating Columbo recites the names of those guns in the case. But then, he almost always goes through a crash course in some subject or other, so maybe he finally got around to the subject of guns in this episode?