diff --git a/include/SDL_keyboard.h b/include/SDL_keyboard.h
index fca34506f..cccafd001 100644
--- a/include/SDL_keyboard.h
+++ b/include/SDL_keyboard.h
@@ -147,7 +147,7 @@ extern DECLSPEC void SDLCALL SDL_StartTextInput(SDL_Window *window);
  *  
  *  \sa SDL_StartTextInput()
  */
-extern DECLSPEC void SDLCALL SDL_StopTextInput(void);
+extern DECLSPEC void SDLCALL SDL_StopTextInput(SDL_Window *window);
 
 /**
  *  \brief Set the rectangle used to type Unicode text inputs.
diff --git a/src/SDL_compat.c b/src/SDL_compat.c
index 51b9b5ceb..112510598 100644
--- a/src/SDL_compat.c
+++ b/src/SDL_compat.c
@@ -1744,7 +1744,7 @@ SDL_EnableUNICODE(int enable)
         break;
     case 0:
         SDL_enabled_UNICODE = 0;
-        SDL_StopTextInput();
+        SDL_StopTextInput(SDL_VideoWindow);
         break;
     }
     return previous;
diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
index 69ecb440d..7d93428f1 100644
--- a/src/video/SDL_sysvideo.h
+++ b/src/video/SDL_sysvideo.h
@@ -300,7 +300,7 @@ struct SDL_VideoDevice
 
     /* Text input */
     void (*StartTextInput) (_THIS, SDL_Window *window);
-    void (*StopTextInput) (_THIS);
+    void (*StopTextInput) (_THIS, SDL_Window *window);
     void (*SetTextInputRect) (_THIS, SDL_Rect *rect);
 
     /* * * */
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 744defea4..8e10ede43 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -3395,10 +3395,10 @@ SDL_StartTextInput(SDL_Window *window)
 }
 
 void
-SDL_StopTextInput(void)
+SDL_StopTextInput(SDL_Window *window)
 {
     if (_this && _this->StopTextInput) {
-        _this->StopTextInput(_this);
+        _this->StopTextInput(_this, window);
     }
     SDL_EventState(SDL_TEXTINPUT, SDL_DISABLE);
     SDL_EventState(SDL_TEXTEDITING, SDL_DISABLE);
diff --git a/src/video/win32/SDL_win32keyboard.c b/src/video/win32/SDL_win32keyboard.c
index 4ee297be7..3f2c4055f 100644
--- a/src/video/win32/SDL_win32keyboard.c
+++ b/src/video/win32/SDL_win32keyboard.c
@@ -130,7 +130,7 @@ WIN_StartTextInput(_THIS, SDL_Window *window)
 }
 
 void
-WIN_StopTextInput(_THIS)
+WIN_StopTextInput(_THIS, SDL_Window *window)
 {
 
 }
diff --git a/src/video/win32/SDL_win32keyboard.h b/src/video/win32/SDL_win32keyboard.h
index d9e54b3bd..dd3b3610d 100644
--- a/src/video/win32/SDL_win32keyboard.h
+++ b/src/video/win32/SDL_win32keyboard.h
@@ -32,7 +32,7 @@ extern void WIN_UpdateKeymap(void);
 extern void WIN_QuitKeyboard(_THIS);
 
 extern void WIN_StartTextInput(_THIS, SDL_Window *window);
-extern void WIN_StopTextInput(_THIS);
+extern void WIN_StopTextInput(_THIS, SDL_Window *window);
 extern void WIN_SetTextInputRect(_THIS, SDL_Rect *rect);
 
 #endif /* _SDL_win32keyboard_h */