diff --git a/ui/element.cpp b/ui/element.cpp
index 8f69653..3c9bf55 100644
--- a/ui/element.cpp
+++ b/ui/element.cpp
@@ -19,7 +19,7 @@ std::map<int,std::string> element_names = boost::assign::map_list_of
 UIElement::~UIElement() {
     { if(ui && selected) ui->deselect(); };
 }
-    
+
 const std::string& UIElement::getElementName() const {
     return getElementName(this->getType());
 }
@@ -62,7 +62,7 @@ void UIElement::getModifiers(bool& left_ctrl, bool& left_shift) {
 
     left_ctrl = left_shift = false;
 
-    Uint8* keystate = SDL_GetKeyboardState(NULL);
+    const Uint8* keystate = SDL_GetKeyboardState(NULL);
 
     if(keystate[SDL_SCANCODE_LCTRL])  left_ctrl  = true;
     if(keystate[SDL_SCANCODE_LSHIFT]) left_shift = true;
diff --git a/ui/scroll_bar.cpp b/ui/scroll_bar.cpp
index 7d0c3f6..941db92 100644
--- a/ui/scroll_bar.cpp
+++ b/ui/scroll_bar.cpp
@@ -126,7 +126,7 @@ void UIScrollBar::scroll(bool up) {
     bool left_shift = false;
 
 #if SDL_VERSION_ATLEAST(2,0,0)
-    Uint8* keystate = SDL_GetKeyboardState(NULL);
+    const Uint8* keystate = SDL_GetKeyboardState(NULL);
 
     if(keystate[SDL_SCANCODE_LCTRL])  left_ctrl  = true;
     if(keystate[SDL_SCANCODE_LSHIFT]) left_shift = true;
diff --git a/ui/ui.cpp b/ui/ui.cpp
index b31b5e9..974ec42 100644
--- a/ui/ui.cpp
+++ b/ui/ui.cpp
@@ -131,7 +131,7 @@ void UI::deselect() {
     if(!selectedElement) return;
 
     if(selectedElement->isEditable()) SDL_StopTextInput();
-    
+
     selectedElement->setSelected(false);
     selectedElement = 0;
 }
@@ -140,7 +140,7 @@ void UI::selectElement(UIElement* element) {
     if(selectedElement == element) return;
 
     deselect();
-    
+
     selectedElement = element;
 
     if(element!=0) {
@@ -149,7 +149,7 @@ void UI::selectElement(UIElement* element) {
         if(element->isEditable()) {
             SDL_StartTextInput();
         }
-        
+
     }
 }
 
@@ -171,7 +171,7 @@ UIElement* UI::selectElementAt(const vec2& pos) {
     }
 
     selectElement(found);
-    
+
     return found;
 }
 
@@ -265,14 +265,14 @@ UIElement* UI::processMouse(MouseCursor& cursor) {
 
         left_pressed = true;
         return click(cursor);
-        
+
     } else if(cursor.leftButtonPressed()) {
 
         if(mousemove) {
             left_drag = true;
             return drag(cursor);
         }
-        
+
     } else {
         if(left_pressed) {
             if(left_drag) {
@@ -312,15 +312,15 @@ void UI::textEdit(SDL_TextEditingEvent* e) {
     UIElement* selected = getSelected();
 
     if(!selected) return;
-    
-    selected->setText(e->text);   
+
+    selected->setText(e->text);
 }
 
 void UI::textInput(SDL_TextInputEvent *e) {
     UIElement* selected = getSelected();
 
     if(!selected) return;
-    
+
     selected->setText(e->text);
     selected->submit();
 }
@@ -331,7 +331,7 @@ bool UI::keyPress(SDL_KeyboardEvent *e) {
 
     if(!selected) return false;
 
-    if(e->keysym.unicode == SDLK_ESCAPE) {
+    if(e->keysym.sym == SDLK_ESCAPE) {
         deselect();
         return selected->isEditable();
     }