How to turn a boxed text into a normal text?

Sometimes I drag the mouse with the Text tool in order to make a box that the text can fit like I want, but I've been having a problem that sometimes I want to align my text inside a shape and when it's the boxed text the align feature won't work properly, probably because the text is with a different shape because of the box. So I have to manually create a new text layer without dragging the mouse and copying the text and stuff, this takes some time, I wanna know if there's a way to just convert the boxed text into normal text with the click of a button. Or maybe a way to make the boxed text be aligned properly within a shape or a selection,