diff --git a/gfx/drivers_context/d3d_ctx.cpp b/gfx/drivers_context/d3d_ctx.cpp
index aff897138f..faa0565593 100644
--- a/gfx/drivers_context/d3d_ctx.cpp
+++ b/gfx/drivers_context/d3d_ctx.cpp
@@ -161,11 +161,9 @@ static bool gfx_ctx_d3d_bind_api(void *data,
 
 static void *gfx_ctx_d3d_init(void *video_driver)
 {
-   (void)video_driver;
-
    win32_monitor_init();
 
-   return (void*)"d3d";
+   return video_driver;
 }
 
 static void gfx_ctx_d3d_destroy(void *data)
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 1d873720a7..b0d8a32799 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -423,7 +423,12 @@ static void init_video_input(const input_driver_t *tmp)
 {
    const input_driver_t **input = input_get_double_ptr();
    if (*input)
+   {
+      if (!input_driver_get_data() && !input_driver_ctl(RARCH_INPUT_CTL_INIT, NULL))
+         goto error;
+
       return;
+   }
 
    /* Reset video frame count */
    video_driver_frame_count = 0;