diff --git a/src/sdl2_driver.c b/src/sdl2_driver.c
index afb442c..e253fc6 100644
--- a/src/sdl2_driver.c
+++ b/src/sdl2_driver.c
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <libgen.h>  // just for basename :P
+#include <string.h>
 #include "defc.h"
 #ifdef HAVE_ICON    // Currently a flag because not supported outside of SDL builds.  Looking at full solution.
   #include "icongs.h"
@@ -422,6 +423,14 @@ check_input_events_sdl()
 				SDL_Quit();
 				my_exit(1);
 				break;
+			case SDL_DROPFILE:
+				{
+				char *file = event.drop.file;
+				cfg_inspect_maybe_insert_file(file, 0);
+				SDL_free(file);
+				}
+				break;
+
 			default:
 				break;
 		}
@@ -573,32 +582,6 @@ x_dialog_create_gsport_conf(const char *str)
 	config_write_config_gsplus_file();
 }
 
-char *g_clipboard;
-size_t  g_clipboard_pos;
-
-void clipboard_paste(void) {
-  char *clipboard;
-  if (SDL_HasClipboardText()) {
-    clipboard = SDL_GetClipboardText();
-    if (g_clipboard) {
-      free(g_clipboard);
-      g_clipboard_pos = 0;
-    }
-    g_clipboard = strdup(clipboard);
-    free(clipboard);
-  }
-}
-
-int clipboard_get_char() {
-	if (!g_clipboard)
-		return 0;
-	if (g_clipboard[g_clipboard_pos] == '\n')
-		g_clipboard_pos++;
-	if (g_clipboard[g_clipboard_pos] == '\0')
-		return 0;
-	return g_clipboard[g_clipboard_pos++] | 0x80;
-}
-
 void x_full_screen(int do_full) {
   if (do_full) {
     SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP);
@@ -691,6 +674,56 @@ void x_release_kimage(Kimage* kimage_ptr) { }
 int x_calc_ratio(float x,float y) { return 1; }
 
 
+static char *g_clipboard = NULL;
+static size_t  g_clipboard_pos = 0;
+
+void clipboard_paste(void) {
+
+	char *cp;
+
+	if (g_clipboard) {
+		free(g_clipboard);
+		g_clipboard = NULL;
+		g_clipboard_pos = 0;
+	}
+
+	cp =  SDL_GetClipboardText();
+	if (!cp) return;
+
+	g_clipboard = strdup(cp);
+	g_clipboard_pos = 0;
+
+	SDL_free(cp);
+}
+
+int clipboard_get_char(void) {
+	char c;
+
+	if (!g_clipboard)
+		return 0;
+
+	/* skip utf-8 characters. */
+	do {
+		c = g_clipboard[g_clipboard_pos++];
+	} while (c & 0x80);
+
+	/* windows -- skip the \n in \r\n. */  
+	if (c == '\r' && g_clipboard[g_clipboard_pos] == '\n')
+			g_clipboard_pos++;
+
+	/* everybody else -- convert \n to \r */
+	if (c == '\n') c = '\r';
+
+	if (c == 0) {
+		free(g_clipboard);
+		g_clipboard = NULL;
+		g_clipboard_pos = 0;
+		return 0;		
+	}
+
+	return c | 0x80;
+}
+
 void x_set_mask_and_shift(word32 x_mask, word32 *mask_ptr, int *shift_left_ptr, int *shift_right_ptr) {	return; }
 void x_update_color(int col_num, int red, int green, int blue, word32 rgb) { }
 void x_update_physical_colormap() { }