diff --git a/Editor/main_SDL2.cpp b/Editor/main_SDL2.cpp
index 0e95c96ee..6f5a03c38 100644
--- a/Editor/main_SDL2.cpp
+++ b/Editor/main_SDL2.cpp
@@ -1,6 +1,8 @@
 #include "stdafx.h"
 #include "Editor.h"
 
+#include <SDL_events.h>
+#include <SDL_scancode.h>
 #include <fstream>
 
 #include "stdafx.h"
@@ -9,10 +11,78 @@
 
 using namespace std;
 
+//Convert SDL scancode to character input
+//Keyboard layout is based on the standard US keyboard layout
+char sdl_character(){
+    int numkeys;
+	const uint8_t *state = SDL_GetKeyboardState(&numkeys);
+
+    char result = -1;
+
+    if(state[SDL_SCANCODE_BACKSPACE] || state[SDL_SCANCODE_DELETE]) return 127; //127 = Delete ascii code
+
+    bool mod = (state[SDL_SCANCODE_LSHIFT] || state[SDL_SCANCODE_RSHIFT]); //Keyboard shift behavior
+    mod = (state[SDL_SCANCODE_CAPSLOCK]) ? !mod : mod; //Keyboard capslock behavior
+
+    //Keycode to character coversion code
+    if(state[SDL_SCANCODE_1]) result = (mod) ? '!' : '1';
+    if(state[SDL_SCANCODE_2]) result = (mod) ? '@' : '2';
+    if(state[SDL_SCANCODE_3]) result = (mod) ? '#' : '3';
+    if(state[SDL_SCANCODE_4]) result = (mod) ? '#' : '4';
+    if(state[SDL_SCANCODE_5]) result = (mod) ? '%' : '5';
+    if(state[SDL_SCANCODE_6]) result = (mod) ? '^' : '6';
+    if(state[SDL_SCANCODE_7]) result = (mod) ? '&' : '7';
+    if(state[SDL_SCANCODE_8]) result = (mod) ? '*' : '8';
+    if(state[SDL_SCANCODE_9]) result = (mod) ? '(' : '9';
+    if(state[SDL_SCANCODE_0]) result = (mod) ? ')' : '0';
+    if(state[SDL_SCANCODE_A]) result = (mod) ? 'A' : 'a';
+    if(state[SDL_SCANCODE_B]) result = (mod) ? 'B' : 'b';
+    if(state[SDL_SCANCODE_C]) result = (mod) ? 'C' : 'c';
+    if(state[SDL_SCANCODE_D]) result = (mod) ? 'D' : 'd';
+    if(state[SDL_SCANCODE_E]) result = (mod) ? 'E' : 'e';
+    if(state[SDL_SCANCODE_F]) result = (mod) ? 'F' : 'f';
+    if(state[SDL_SCANCODE_G]) result = (mod) ? 'G' : 'g';
+    if(state[SDL_SCANCODE_H]) result = (mod) ? 'H' : 'h';
+    if(state[SDL_SCANCODE_I]) result = (mod) ? 'I' : 'i';
+    if(state[SDL_SCANCODE_J]) result = (mod) ? 'J' : 'j';
+    if(state[SDL_SCANCODE_K]) result = (mod) ? 'K' : 'k';
+    if(state[SDL_SCANCODE_L]) result = (mod) ? 'L' : 'l';
+    if(state[SDL_SCANCODE_M]) result = (mod) ? 'M' : 'm';
+    if(state[SDL_SCANCODE_N]) result = (mod) ? 'N' : 'n';
+    if(state[SDL_SCANCODE_O]) result = (mod) ? 'O' : 'o';
+    if(state[SDL_SCANCODE_P]) result = (mod) ? 'P' : 'p';
+    if(state[SDL_SCANCODE_Q]) result = (mod) ? 'Q' : 'q';
+    if(state[SDL_SCANCODE_R]) result = (mod) ? 'R' : 'r';
+    if(state[SDL_SCANCODE_S]) result = (mod) ? 'S' : 's';
+    if(state[SDL_SCANCODE_T]) result = (mod) ? 'T' : 't';
+    if(state[SDL_SCANCODE_U]) result = (mod) ? 'U' : 'u';
+    if(state[SDL_SCANCODE_V]) result = (mod) ? 'V' : 'v';
+    if(state[SDL_SCANCODE_W]) result = (mod) ? 'W' : 'w';
+    if(state[SDL_SCANCODE_X]) result = (mod) ? 'X' : 'x';
+    if(state[SDL_SCANCODE_Y]) result = (mod) ? 'Y' : 'y';
+    if(state[SDL_SCANCODE_Z]) result = (mod) ? 'Z' : 'z';
+    if(state[SDL_SCANCODE_MINUS]) result = (mod) ? '_' : '-';
+    if(state[SDL_SCANCODE_EQUALS]) result = (mod) ? '+' : '=';
+    if(state[SDL_SCANCODE_GRAVE]) result = (mod) ? '~' : '`';
+    if(state[SDL_SCANCODE_LEFTBRACKET]) result = (mod) ? '{' : '[';
+    if(state[SDL_SCANCODE_RIGHTBRACKET]) result = (mod) ? '}' : ']';
+    if(state[SDL_SCANCODE_BACKSLASH]) result = (mod) ? '|' : '\\';
+    if(state[SDL_SCANCODE_SEMICOLON]) result = (mod) ? ':' : ';';
+    if(state[SDL_SCANCODE_APOSTROPHE]) result = (mod) ? '\"' : '\'';
+    if(state[SDL_SCANCODE_COMMA]) result = (mod) ? '<' : ',';
+    if(state[SDL_SCANCODE_PERIOD]) result = (mod) ? '>' : '.';
+    if(state[SDL_SCANCODE_SLASH]) result = (mod) ? '?' : '/';
+
+    return result;
+}
+
 int sdl_loop(Editor &editor)
 {
     SDL_Event event;
 
+    //Buffer for key input comparison, to make sure when a key is pressed the input is done once
+    char cbuf = -1;
+
     bool quit = false;
     while (!quit)
     {
@@ -28,6 +98,9 @@ int sdl_loop(Editor &editor)
         }
 
         if (ret > 0) {
+            if (event.type == SDL_KEYUP) //Flush key input comparison because key is up
+                cbuf = -1;
+
             if (event.type == SDL_WINDOWEVENT) {
                 switch (event.window.event) {
                     case SDL_WINDOWEVENT_CLOSE:   // exit game
@@ -40,6 +113,25 @@ int sdl_loop(Editor &editor)
             }
         }
 
+        //Text input code
+        char c = sdl_character();
+        if(c != cbuf) //Accept the same key only once, can accept the same key only when key press status is up
+        {
+            if(c == 127)
+            {
+                if (wiBackLog::isActive())
+	        		wiBackLog::deletefromInput();
+	        	wiTextInputField::DeleteFromInput();
+            }
+            else if (c != -1)
+            {
+                if (wiBackLog::isActive())
+	        		wiBackLog::input(c);
+	        	wiTextInputField::AddInput(c);
+            }
+        }
+        cbuf = c;
+
     }
 
     return 0;
diff --git a/WickedEngine/wiSDLInput.cpp b/WickedEngine/wiSDLInput.cpp
index 69cdb3c3a..c01c8cf34 100644
--- a/WickedEngine/wiSDLInput.cpp
+++ b/WickedEngine/wiSDLInput.cpp
@@ -39,6 +39,7 @@ namespace wiSDLInput
 //        }
         // mouse.position.x = saved_x;
         // mouse.position.y = saved_y;
+        mouse.delta_wheel = 0;
 
         std::vector<SDL_Event> events(1000);