diff --git a/src/dialogs/save/save.c b/src/dialogs/save/save.c
index 8ea6e49..3968f7c 100644
--- a/src/dialogs/save/save.c
+++ b/src/dialogs/save/save.c
@@ -61,18 +61,6 @@
 	}
  };
 
- static const struct _charsets
- {
-	const gchar *name;
-	const gchar *description;
- } charsets[] =
- {
-	// http://en.wikipedia.org/wiki/Character_encoding
-	{ "UTF-8",		N_( "UTF-8"	)								},
-	{ "ISO-8859-1", N_( "Western Europe (ISO 8859-1)" ) 		},
-	{ "CP1252",		N_( "Windows Western languages (CP1252)" )	},
- };
-
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
 /*
@@ -224,43 +212,14 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
 
 	// Charset drop-down
 	{
-		size_t ix;
-		const gchar	* scharset	= NULL;
-
 		widget = gtk_label_new_with_mnemonic (_("C_haracter Coding"));
 		gtk_widget_set_halign(widget,GTK_ALIGN_END);
 		gtk_widget_set_valign(widget,GTK_ALIGN_CENTER);
 		gtk_grid_attach(grid,widget,0,1,1,1);
 
-		dialog->charset =  gtk_combo_box_text_new();
-
-		g_get_charset(&scharset);
-
-		g_autofree gchar * text = g_strdup_printf(_("Current (%s)"),scharset);
-		gtk_combo_box_text_insert(
-			GTK_COMBO_BOX_TEXT(dialog->charset),
-			0,
-			scharset,
-			text
-		);
-
-		gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->charset),0);
-
+		dialog->charset = v3270_charset_combo_box_new();
 		gtk_grid_attach(grid,dialog->charset,1,1,1,1);
 
-		for(ix=0;ix<G_N_ELEMENTS(charsets);ix++)
-		{
-			if(g_ascii_strcasecmp(charsets[ix].name,scharset))
-			{
-				gtk_combo_box_text_insert(
-					GTK_COMBO_BOX_TEXT(dialog->charset),
-					ix+1,
-					charsets[ix].name,
-					gettext(charsets[ix].description)
-				);
-			}
-		}
-
 	}
 
 	// Format drop-down
diff --git a/src/dialogs/tools.c b/src/dialogs/tools.c
index 4fcd8ee..0fc7675 100644
--- a/src/dialogs/tools.c
+++ b/src/dialogs/tools.c
@@ -124,3 +124,52 @@
  }
 
  #endif //! GTK 3.16
+
+ GtkWidget	* v3270_charset_combo_box_new()
+ {
+	static const struct _charsets
+	{
+		const gchar *name;
+		const gchar *description;
+	} charsets[] =
+	{
+		// http://en.wikipedia.org/wiki/Character_encoding
+		{ "UTF-8",		N_( "UTF-8"	)								},
+		{ "ISO-8859-1", N_( "Western Europe (ISO 8859-1)" ) 		},
+		{ "CP1252",		N_( "Windows Western languages (CP1252)" )	},
+	};
+
+	size_t		  ix;
+	const gchar	* scharset	= NULL;
+	GtkWidget	* widget	= gtk_combo_box_text_new();
+
+	g_get_charset(&scharset);
+
+	g_autofree gchar * text = g_strdup_printf(_("Current (%s)"),scharset);
+	gtk_combo_box_text_insert(
+		GTK_COMBO_BOX_TEXT(widget),
+		0,
+		scharset,
+		text
+	);
+
+	gtk_combo_box_set_active(GTK_COMBO_BOX(widget),0);
+
+	for(ix=0;ix<G_N_ELEMENTS(charsets);ix++)
+	{
+		if(g_ascii_strcasecmp(charsets[ix].name,scharset))
+		{
+			gtk_combo_box_text_insert(
+				GTK_COMBO_BOX_TEXT(widget),
+				ix+1,
+				charsets[ix].name,
+				gettext(charsets[ix].description)
+			);
+		}
+	}
+
+	return widget;
+
+ }
+
+
diff --git a/src/include/internals.h b/src/include/internals.h
index 7c4d70b..2ee0e95 100644
--- a/src/include/internals.h
+++ b/src/include/internals.h
@@ -108,6 +108,8 @@
  G_GNUC_INTERNAL void			  v3270_dialog_close(GtkDialog *dialog, gpointer user_data);
 
 
+/*--[ Internal Widgets & Tools ]---------------------------------------------------------------------*/
+
 #if GTK_CHECK_VERSION(3,12,0)
  G_GNUC_INTERNAL GtkHeaderBar	* v3270_dialog_get_header_bar(GtkWidget * widget);
  G_GNUC_INTERNAL void			  v3270_dialog_cancel(GtkButton G_GNUC_UNUSED(*button), GtkWidget *dialog);
@@ -135,11 +137,14 @@
 
  G_GNUC_INTERNAL gchar		* v3270_select_file(GtkWidget *widget, const gchar *title, const gchar *button, GtkFileChooserAction action, const gchar *filename, const gchar *filter, ... ) G_GNUC_NULL_TERMINATED;
 
- #if ! GTK_CHECK_VERSION(3,16,0)
-
+#if ! GTK_CHECK_VERSION(3,16,0)
  G_GNUC_INTERNAL void gtk_text_view_set_monospace (GtkTextView *text_view, gboolean monospace);
+#endif //! GTK 3.16
+
+ G_GNUC_INTERNAL GtkWidget	* v3270_charset_combo_box_new();
+
+/*--[ Internal Methods ]-----------------------------------------------------------------------------*/
 
- #endif //! GTK 3.16
 
  const GtkWidgetClass		* v3270_get_parent_class(void);
 
--
libgit2 0.21.2