diff --git a/src/gtk/actions.c b/src/gtk/actions.c
index 5d51a27..e84322a 100644
--- a/src/gtk/actions.c
+++ b/src/gtk/actions.c
@@ -97,8 +97,35 @@ static void reload_action(GtkAction *action, GtkWidget *widget)
 
 static void copy_action(GtkAction *action, GtkWidget *widget)
 {
-	trace("Action %s activated on widget %p",gtk_action_get_name(action),widget);
-	v3270_copy(widget);
+	V3270_SELECT_FORMAT	  mode = V3270_SELECT_TEXT;
+	const gchar 		* str = (const gchar *) g_object_get_data(G_OBJECT(action),"format");
+
+	if(str)
+	{
+		static const struct _format
+		{
+			V3270_SELECT_FORMAT	  mode;
+			const gchar			* name;
+		} format[] =
+		{
+			{ V3270_SELECT_TEXT,	"text"		},
+			{ V3270_SELECT_TABLE,	"table"		},
+		};
+
+		int f;
+
+		for(f=0;f<G_N_ELEMENTS(format);f++)
+		{
+			if(!g_strcasecmp(format[f].name,str))
+			{
+				mode = format[f].mode;
+				break;
+			}
+		}
+	}
+
+	trace("Action %s activated on widget %p mode=%d",gtk_action_get_name(action),widget,(int) mode);
+	v3270_copy(widget,mode);
 }
 
 static void append_action(GtkAction *action, GtkWidget *widget)
@@ -455,23 +482,13 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash
 	}
 	else if(!g_strcasecmp(name,"copy"))
 	{
-		static const gchar * src[] = 	{	"begin",
-											"table",
-											"image",
-											"append",
-											NULL
-											};
-
 		static const GCallback cbk[] =	{	G_CALLBACK(copy_action),
-											G_CALLBACK(nop_action),
-											G_CALLBACK(nop_action),
 											G_CALLBACK(append_action)
 											};
 		callback	= cbk;
 		action_type	= ACTION_TYPE_TABLE;
-		id = get_attribute_id(name,"mode",&nm,src,names,values,error);
-		if(id < 0)
-			return NULL;
+		id 			= ui_get_bool_attribute("append",names,values,FALSE) ? 1 : 0;
+		nm 			= g_strconcat(id == 0 ? "copy" : "append",ui_get_attribute("format",names,values),NULL);
 	}
 	else if(!g_strcasecmp(name,"select"))
 	{
diff --git a/src/gtk/v3270/clipboard.c b/src/gtk/v3270/clipboard.c
index 216d3ec..87f4abf 100644
--- a/src/gtk/v3270/clipboard.c
+++ b/src/gtk/v3270/clipboard.c
@@ -96,6 +96,18 @@ gchar * v3270_get_text(GtkWidget *widget, int offset, int len)
 	return text;
 }
 
+static gchar * v3270_get_selected(v3270 *widget)
+{
+	gchar *text = lib3270_get_selected(widget->host);
+	if(text)
+	{
+		gchar *str = g_strdup(text);
+		free(text);
+		return str;
+	}
+	return NULL;
+}
+
 const gchar * v3270_get_selected_text(GtkWidget *widget)
 {
 	v3270 *terminal;
@@ -111,7 +123,7 @@ const gchar * v3270_get_selected_text(GtkWidget *widget)
 		terminal->clipboard = NULL;
 	}
 
-	text = lib3270_get_selected(terminal->host);
+	text = v3270_get_selected(terminal);
 
 	if(!text)
 	{
@@ -120,9 +132,85 @@ const gchar * v3270_get_selected_text(GtkWidget *widget)
 		return NULL;
 	}
 
+	if(terminal->table)
+	{
+		// Convert text to table
+		gchar 		**ln = g_strsplit(text,"\n",-1);
+		int			  width = lib3270_get_width(terminal->host);
+		gboolean	  cols[width];
+		int 		  l;
+		GString		* buffer;
+
+		memset(cols,0,sizeof(gboolean)*width);
+
+		// Find column delimiters
+		for(l=0;ln[l];l++)
+		{
+			int		  c;
+			gchar 	* ptr = ln[l];
+			GString	* buffer;
+
+			for(c=0;c<width && *ptr;c++)
+			{
+				if(!g_ascii_isspace(*ptr))
+					cols[c] = TRUE;
+
+				ptr++;
+			}
+
+		}
+
+		// Read screen contents
+		buffer = g_string_sized_new(strlen(text));
+		for(l=0;ln[l];l++)
+		{
+			int 	  col	= 0;
+			gchar	* src	= ln[l];
+
+			while(col < width && *src)
+			{
+				if(col)
+					g_string_append_c(buffer,'\t');
+
+				// Find column start
+				while(!cols[col] && col < width && *src)
+				{
+					col++;
+					src++;
+				}
+
+				if(col < width && *src)
+				{
+					gchar	  tmp[width+1];
+					gchar	* dst = tmp;
+
+					// Copy column content
+					while(cols[col] && col < width && *src)
+					{
+						*dst = *src;
+						col++;
+						dst++;
+						src++;
+					}
+					*dst = 0;
+					g_string_append(buffer,g_strstrip(tmp));
+				}
+
+			}
+			g_string_append_c(buffer,'\n');
+
+		}
+
+		g_strfreev(ln);
+		g_free(text);
+
+		text = g_string_free(buffer,FALSE);
+	}
+
 	terminal->clipboard = g_convert(text, -1, "UTF-8", lib3270_get_charset(terminal->host), NULL, NULL, NULL);
 
-	free(text);
+	g_free(text);
+
 
 	return terminal->clipboard;
 }
@@ -175,11 +263,17 @@ const gchar * v3270_copy_append(GtkWidget *widget)
 	return terminal->clipboard;
 }
 
-const gchar * v3270_copy(GtkWidget *widget)
+const gchar * v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode)
 {
-	const gchar		* text		= v3270_get_selected_text(widget);
+	const gchar		* text;
 	GtkClipboard	* clipboard	= gtk_widget_get_clipboard(widget,GDK_SELECTION_CLIPBOARD);
 
+	g_return_val_if_fail(GTK_IS_V3270(widget),NULL);
+
+	GTK_V3270(widget)->table = (mode == V3270_SELECT_TABLE ? 1 : 0);
+
+	text = v3270_get_selected_text(widget);
+
 	if(text)
 	{
 		if(gtk_clipboard_set_with_owner(	clipboard,
diff --git a/src/gtk/v3270/private.h b/src/gtk/v3270/private.h
index 9dc74b3..1dfc855 100644
--- a/src/gtk/v3270/private.h
+++ b/src/gtk/v3270/private.h
@@ -121,10 +121,11 @@ G_BEGIN_DECLS
  {
 	GtkWidget parent;
 
-	// private
+	// flags
 	int selecting	: 1;	/**< Selecting region */
 	int moving		: 1;	/**< Moving selected region */
 	int resizing	: 1;	/**< Resizing selected region */
+	int table		: 1;	/**< Copy mode is table */
 
 #if GTK_CHECK_VERSION(3,0,0)
 
diff --git a/src/gtk/v3270/v3270.h b/src/gtk/v3270/v3270.h
index d1f8843..0291057 100644
--- a/src/gtk/v3270/v3270.h
+++ b/src/gtk/v3270/v3270.h
@@ -142,11 +142,20 @@
  void			  v3270_disconnect(GtkWidget *widget);
 
  // Clipboard
+ typedef enum _v3270_select_format
+ {
+	V3270_SELECT_TEXT,
+	V3270_SELECT_TABLE,
+
+	V3270_SELECT_MAX
+ } V3270_SELECT_FORMAT;
+
+ const gchar	* v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode);
+ const gchar	* v3270_copy_append(GtkWidget *widget);
+
  const gchar	* v3270_get_selected_text(GtkWidget *widget);
  const gchar	* v3270_get_copy(GtkWidget *widget);
  gchar			* v3270_get_text(GtkWidget *widget,int offset, int len);
- const gchar	* v3270_copy(GtkWidget *widget);
- const gchar	* v3270_copy_append(GtkWidget *widget);
 
  void 			  v3270_paste(GtkWidget *widget);
  void 			  v3270_paste_string(GtkWidget *widget, const gchar *text, const gchar *encoding);
diff --git a/src/include/lib3270.h b/src/include/lib3270.h
index 2c44bde..3f55a3d 100644
--- a/src/include/lib3270.h
+++ b/src/include/lib3270.h
@@ -267,6 +267,17 @@
 	 */
 	LIB3270_EXPORT void lib3270_get_screen_size(H3270 *h, int *r, int *c);
 
+
+	/**
+	 * Get current screen width in columns.
+	 *
+	 * @param h	Handle of the desired session.
+	 *
+	 * @return screen width.
+	 *
+	 */
+	LIB3270_EXPORT int lib3270_get_width(H3270 *h);
+
 	LIB3270_EXPORT unsigned int lib3270_get_length(H3270 *h);
 
 	/**
diff --git a/src/lib3270/screen.c b/src/lib3270/screen.c
index e300441..d841221 100644
--- a/src/lib3270/screen.c
+++ b/src/lib3270/screen.c
@@ -244,6 +244,12 @@ LIB3270_EXPORT void lib3270_get_screen_size(H3270 *h, int *r, int *c)
 	*c = h->cols;
 }
 
+LIB3270_EXPORT int lib3270_get_width(H3270 *h)
+{
+	CHECK_SESSION_HANDLE(h);
+	return h->cols;
+}
+
 void update_model_info(H3270 *session, int model, int cols, int rows)
 {
 	if(model == session->model_num && session->maxROWS == rows && session->maxCOLS == cols)
diff --git a/ui/00default.xml b/ui/00default.xml
index 2f2a4f3..06f4f82 100644
--- a/ui/00default.xml
+++ b/ui/00default.xml
@@ -57,10 +57,10 @@
 		</menu>
 
 		<menu name='EditMenu' label='_Edit' >
-			<menuitem action='copy' mode='begin' key='<ctrl>c' icon='copy' group='selection' label='Copy' />
-			<!-- menuitem action='copy' mode='table' key='<ctrl><alt>c' group='selection' label='Copy as table' /-->
+			<menuitem action='copy' append='no' format='text' key='<ctrl>c' icon='copy' group='selection' label='Copy' />
+			<menuitem action='copy' append='no' format='table' key='<ctrl><alt>c' group='selection' label='Copy as table' />
 			<!-- menuitem action='copy' mode='image' group='selection' label='Copy as image' /-->
-			<menuitem action='copy' mode='append' key='<shift><ctrl>c' group='selection' label='Add to copy' />
+			<menuitem action='copy' append='yes' key='<shift><ctrl>c' group='selection' label='Add to copy' />
 			<menuitem action='paste' src='clipboard' key='<ctrl>v' icon='paste' group='paste' label='Paste' />
 			<menuitem action='paste' src='next' key='<shift><ctrl>v' label='Paste next' />
 
@@ -144,7 +144,7 @@
 
 	<toolbar name='toolbar.default' label='Toolbar' key='<alt>t' >
 		<toolitem action='selectall' />
-		<toolitem action='copy' mode='begin'  />
+		<toolitem action='copy' append='no' format='text' />
 		<toolitem action='paste' src='clipboard' />
 		<toolitem action='EraseInput' />
 
@@ -161,8 +161,8 @@
 	</toolbar>
 
 	<popup name='selectionpopup' type='selection'>
-		<menuitem action='copy' mode='begin' />
-		<menuitem action='copy' mode='append' />
+		<menuitem action='copy' append='no' format='text' />
+		<menuitem action='copy' append='yes' />
 		<menuitem action='select' target='none'/>
 		<menuitem action='select' target='all'/>
 
--
libgit2 0.21.2