Button placement on modals – should it be consistent at ALL times?

I'm currently designing an app for iPads.

I illustrated the situation below:Image descirbing guy's problem

The screen on the left is current version which seems to work really well when the user doesn't have to use the keyboard or when there's only one or two textfields (then, modal window is short enough for the keyboard to fit with the "Create" button).

Currently, when the keyboard is overlapping the window (middle picture) I am moving the "create" button to the top-right corner, so that the primary button is not obstructed.

  • Should I change the middle-picture version to the one on the right in order to be consistent?
  • Is there any other solution for my problem?

Cheers and sorry for bad english ;)