Fix Bug 265449 Crash in TOS

Thanks to Sebastian for pointing out the problem. I even found an additional problem
when debugging it.

The remove function is called twice which results in the text shape to be already 0.

BUG: 265449