I think its always a good idea to put the border on a new layer by either creating a new layer or by duplicating the one your working with. Then go to Select->All. Then Edit->Stroke. Under Location make sure "inside" is selected then just experiment with the other settings. You can add other effects to the border by clicking on the little f in the bottom left corner of the layers palette and then selecting blending options.