Readd Action Key Handling

Fixed some Problems with Action Key Handling