diff --git a/src/gtk/actions.c b/src/gtk/actions.c
index 2e1ce7e..8e67451 100644
--- a/src/gtk/actions.c
+++ b/src/gtk/actions.c
@@ -183,41 +183,32 @@ static void selection_move_action(GtkAction *action, GtkWidget *widget)
 	lib3270_move_selection(GTK_V3270(widget)->host,(LIB3270_DIRECTION) g_object_get_data(G_OBJECT(action),"direction"));
 }
 
-void ui_connect_target_action(GtkAction *action, GtkWidget *widget, const gchar *target, const gchar *direction, GError **error)
+static void cursor_move_action(GtkAction *action, GtkWidget *widget)
 {
-	static const gchar *dirname[] = {	"up", "down", "left", "right" };
+	int flags = (int) g_object_get_data(G_OBJECT(action),"move_flags");
+	trace("Action %s activated on widget %p flags=%04x",gtk_action_get_name(action),widget,g_object_get_data(G_OBJECT(action),"move_flags"));
+	lib3270_move_cursor(GTK_V3270(widget)->host,(LIB3270_DIRECTION) (flags & 0x03), (flags & 0x80) );
+}
 
-	LIB3270_DIRECTION dir = (LIB3270_DIRECTION) -1;
+void ui_connect_target_action(GtkAction *action, GtkWidget *widget, const gchar *target, unsigned short flags, GError **error)
+{
 	int f;
 
-	if(!(direction && target))
+	if(!target)
 	{
 		gtk_action_set_sensitive(action,FALSE);
 		return;
 	}
 
-	for(f=0;f<G_N_ELEMENTS(dirname) && dir == -1;f++)
-	{
-		if(!g_strcasecmp(direction,dirname[f]))
-		{
-			dir = f;
-			break;
-		}
-	}
-
-	if(dir == -1)
-	{
-		*error = g_error_new(	g_quark_from_static_string(PACKAGE_NAME),
-								ENOENT,
-								_( "Unexpected direction \"%s\""),
-								direction);
-	}
-
 	if(!g_strcasecmp(target,"selection"))
 	{
-		g_object_set_data(G_OBJECT(action),"direction",(gpointer) dir);
+		g_object_set_data(G_OBJECT(action),"direction",(gpointer) (flags & 3));
 		g_signal_connect(action,"activate",G_CALLBACK(selection_move_action),widget);
-
+	}
+	else if(!g_strcasecmp(target,"cursor"))
+	{
+		g_object_set_data(G_OBJECT(action),"move_flags",(gpointer) ((int) flags));
+		g_signal_connect(action,"activate",G_CALLBACK(cursor_move_action),widget);
 	}
 	else
 	{
diff --git a/src/gtk/uiparser/parsefile.c b/src/gtk/uiparser/parsefile.c
index f40e386..39b5a36 100644
--- a/src/gtk/uiparser/parsefile.c
+++ b/src/gtk/uiparser/parsefile.c
@@ -139,13 +139,32 @@
 
  static GtkAction * get_action(const gchar *name, struct parser *info, const gchar **names, const gchar **values, GError **error)
  {
-	const gchar * target   	= NULL;
-	const gchar * direction	= NULL;
-	const gchar	* id		= ui_get_attribute("id",names,values);
-	GtkAction	* action;
-	gchar		* nm;
-	void		  (*connect)(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id)		= ui_connect_action;
-	GtkAction	* (*create)(const gchar *,const gchar *,const gchar *,const gchar *)						= gtk_action_new;
+	const gchar		* target   	= NULL;
+	const gchar		* direction	= ui_get_attribute("direction",names,values);
+	const gchar		* id		= ui_get_attribute("id",names,values);
+	unsigned short	  flags		= 0;
+	GtkAction		* action;
+	gchar			* nm;
+	void			  (*connect)(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id)		= ui_connect_action;
+	GtkAction		* (*create)(const gchar *,const gchar *,const gchar *,const gchar *)						= gtk_action_new;
+
+	if(direction)
+	{
+		static const gchar *dirname[] = {	"up", "down", "left", "right" };
+		int f;
+
+		for(f=0;f<G_N_ELEMENTS(dirname);f++)
+		{
+			if(!g_strcasecmp(direction,dirname[f]))
+			{
+				flags |= f;
+				break;
+			}
+		}
+	}
+
+	if(ui_get_bool_attribute("selecting",names,values,FALSE))
+		flags |= 0x80;
 
 	if(!g_strcasecmp(name,"toggle"))
 	{
@@ -155,8 +174,7 @@
 	}
 	else if(!g_strcasecmp(name,"move"))
 	{
-		target    = ui_get_attribute("target",names,values);
-		direction = ui_get_attribute("direction",names,values);
+		target = ui_get_attribute("target",names,values);
 
 		if(!(target && direction))
 		{
@@ -164,7 +182,8 @@
 			return NULL;
 		}
 
-		nm = g_strconcat("move",target,direction,NULL);
+		nm = g_strconcat((flags & 0x80) ? "select" : "move",target,direction, NULL);
+
 	}
 	else if(!g_strcasecmp(name,"toggleset"))
 	{
@@ -215,7 +234,7 @@
 		if(ix >= 0)
 			ui_connect_index_action(info->action[ix] = action,info->center_widget,ix,info->action);
 		else if(target)
-			ui_connect_target_action(action,info->center_widget,target,direction,error);
+			ui_connect_target_action(action,info->center_widget,target,flags,error);
 		else if(g_strcasecmp(name,"quit"))
 			connect(action,info->center_widget,name,id);
 		else
diff --git a/src/gtk/uiparser/parser.h b/src/gtk/uiparser/parser.h
index e798e16..ebf4724 100644
--- a/src/gtk/uiparser/parser.h
+++ b/src/gtk/uiparser/parser.h
@@ -53,7 +53,7 @@
 
 	GtkWidget 		* ui_parse_xml_folder(const gchar *path, const gchar ** groupname, const gchar **popupname, const gchar **actionname, GtkWidget *widget, const UI_WIDGET_SETUP *itn);
 	void			  ui_connect_action(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id);
-	void			  ui_connect_target_action(GtkAction *action, GtkWidget *widget, const gchar *target, const gchar *direction, GError **error);
+	void			  ui_connect_target_action(GtkAction *action, GtkWidget *widget, const gchar *target, unsigned short flags, GError **error);
 	void			  ui_connect_index_action(GtkAction *action, GtkWidget *widget, int ix, GtkAction **lst);
 	void			  ui_connect_toggle(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id);
 	void			  ui_connect_pfkey(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id);
diff --git a/src/include/lib3270.h b/src/include/lib3270.h
index e587d7e..dfe0d4b 100644
--- a/src/include/lib3270.h
+++ b/src/include/lib3270.h
@@ -388,6 +388,17 @@
 	LIB3270_EXPORT int lib3270_set_cursor_address(H3270 *h, int baddr);
 
 	/**
+	 * Move cursor
+	 *
+	 * @param h		Session handle.
+	 * @param dir	Direction to move
+	 * @param sel	Non zero to move and selected to the current cursor position
+	 *
+	 * @return 0 if the movement can be done, non zero if failed.
+	 */
+	 LIB3270_EXPORT int lib3270_move_cursor(H3270 *h, LIB3270_DIRECTION dir, unsigned char sel);
+
+	/**
 	 * get cursor address.
 	 *
 	 * @param h		Session handle.
diff --git a/src/lib3270/selection.c b/src/lib3270/selection.c
index e965fb2..3d1fa22 100644
--- a/src/lib3270/selection.c
+++ b/src/lib3270/selection.c
@@ -202,14 +202,14 @@ LIB3270_EXPORT void lib3270_select_to(H3270 *session, int baddr)
 	if(!lib3270_connected(session))
 		return;
 
-	lib3270_set_cursor_address(session,session->select.end = baddr);
-
 	if(!session->selected)
 	{
 		session->select.begin = session->cursor_addr;
 		set_selected(session);
 	}
 
+	lib3270_set_cursor_address(session,session->select.end = baddr);
+
 	update_selection(session);
 
 }
@@ -391,3 +391,47 @@ LIB3270_EXPORT int lib3270_move_selection(H3270 *hSession, LIB3270_DIRECTION dir
 
 	return 0;
 }
+
+LIB3270_EXPORT int lib3270_move_cursor(H3270 *hSession, LIB3270_DIRECTION dir, unsigned char sel)
+{
+	int cursor_addr = hSession->cursor_addr;
+
+	if(!lib3270_connected(hSession))
+		return -1;
+
+	switch(dir)
+	{
+	case LIB3270_DIR_UP:
+		if(cursor_addr <= hSession->cols)
+			return EINVAL;
+		cursor_addr -= hSession->cols;
+		break;
+
+	case LIB3270_DIR_DOWN:
+		if(cursor_addr >= (hSession->cols * (hSession->rows-1)))
+			return EINVAL;
+		cursor_addr += hSession->cols;
+		break;
+
+	case LIB3270_DIR_LEFT:
+		if( (cursor_addr % hSession->cols) < 1)
+			return EINVAL;
+		cursor_addr--;
+		break;
+
+	case LIB3270_DIR_RIGHT:
+		if( (cursor_addr % hSession->cols) >= (hSession->cols-1))
+			return EINVAL;
+		cursor_addr++;
+		break;
+
+	default:
+		return -1;
+	}
+
+	if(sel)
+		lib3270_select_to(hSession,cursor_addr);
+	else
+		lib3270_set_cursor_address(hSession,cursor_addr);
+
+}
diff --git a/ui/00default.xml b/ui/00default.xml
index 4e33c4d..16ff1eb 100644
--- a/ui/00default.xml
+++ b/ui/00default.xml
@@ -189,20 +189,20 @@
 	<accelerator action='SysREQ' key='Sys_Req' group='online' />
 	<accelerator action='SysREQ' key='<shift>Print' group='online' />
 
-	<accelerator action='SelectRight' key='<Shift>Right' group='online' />
-	<accelerator action='SelectLeft' key='<Shift>Left' group='online' />
-	<accelerator action='SelectUp' key='<Shift>Up' group='online' />
-	<accelerator action='SelectDown' key='<Shift>Down' group='online' />
+	<accelerator action='move' target='cursor' direction='right' selecting='yes' key='<Shift>Right' group='online' />
+	<accelerator action='move' target='cursor' direction='left' selecting='yes' key='<Shift>Left' group='online' />
+	<accelerator action='move' target='cursor' direction='up' selecting='yes' key='<Shift>Up' group='online' />
+	<accelerator action='move' target='cursor' direction='down' selecting='yes' key='<Shift>Down' group='online' />
 
 	<accelerator action='move' target='selection' direction='right' key='<alt>Right' />
 	<accelerator action='move' target='selection' direction='left' key='<alt>Left' />
 	<accelerator action='move' target='selection' direction='up' key='<alt>Up' />
 	<accelerator action='move' target='selection' direction='down' key='<alt>Down' />
 
-	<accelerator action='CursorRight' key='Right' group='online' />
-	<accelerator action='CursorLeft' key='Left' group='online' />
-	<accelerator action='CursorUp' key='Up' group='online' />
-	<accelerator action='CursorDown' key='Down' group='online' />
+	<accelerator action='move' target='cursor' direction='right' key='Right' group='online' />
+	<accelerator action='move' target='cursor' direction='left' key='Left' group='online' />
+	<accelerator action='move' target='cursor' direction='up' key='Up' group='online' />
+	<accelerator action='move' target='cursor' direction='down' key='Down' group='online' />
 
 	<accelerator action='PreviousField' key='ISO_Left_Tab' group='online' />
 	<accelerator action='NextField' key='Tab' group='online' />
--
libgit2 0.21.2