Index: uspace/lib/ui/src/entry.c
===================================================================
--- uspace/lib/ui/src/entry.c	(revision 90f1f1988231da4facc94fa385270f4748b2e9cd)
+++ uspace/lib/ui/src/entry.c	(revision 73abf491fd74e2df668b93ec7b38c266f85bac09)
@@ -47,4 +47,5 @@
 #include <ui/entry.h>
 #include <ui/ui.h>
+#include <ui/window.h>
 #include "../private/entry.h"
 #include "../private/resource.h"
@@ -70,10 +71,10 @@
 /** Create new text entry.
  *
- * @param resource UI resource
+ * @param window UI window
  * @param text Text
  * @param rentry Place to store pointer to new text entry
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_entry_create(ui_resource_t *resource, const char *text,
+errno_t ui_entry_create(ui_window_t *window, const char *text,
     ui_entry_t **rentry)
 {
@@ -98,5 +99,5 @@
 	}
 
-	entry->res = resource;
+	entry->window = window;
 	entry->halign = gfx_halign_left;
 	*rentry = entry;
@@ -174,4 +175,5 @@
 errno_t ui_entry_paint(ui_entry_t *entry)
 {
+	ui_resource_t *res;
 	gfx_text_fmt_t fmt;
 	gfx_coord2_t pos;
@@ -181,5 +183,7 @@
 	errno_t rc;
 
-	if (entry->res->textmode) {
+	res = ui_window_get_res(entry->window);
+
+	if (res->textmode) {
 		hpad = ui_entry_hpad_text;
 		vpad = ui_entry_vpad_text;
@@ -189,7 +193,7 @@
 	}
 
-	if (entry->res->textmode == false) {
+	if (res->textmode == false) {
 		/* Paint inset frame */
-		rc = ui_paint_inset_frame(entry->res, &entry->rect, &inside);
+		rc = ui_paint_inset_frame(res, &entry->rect, &inside);
 		if (rc != EOK)
 			goto error;
@@ -200,9 +204,9 @@
 	/* Paint entry background */
 
-	rc = gfx_set_color(entry->res->gc, entry->res->entry_bg_color);
+	rc = gfx_set_color(res->gc, res->entry_bg_color);
 	if (rc != EOK)
 		goto error;
 
-	rc = gfx_fill_rect(entry->res->gc, &inside);
+	rc = gfx_fill_rect(res->gc, &inside);
 	if (rc != EOK)
 		goto error;
@@ -224,13 +228,13 @@
 
 	gfx_text_fmt_init(&fmt);
-	fmt.color = entry->res->entry_fg_color;
+	fmt.color = res->entry_fg_color;
 	fmt.halign = entry->halign;
 	fmt.valign = gfx_valign_top;
 
-	rc = gfx_puttext(entry->res->font, &pos, &fmt, entry->text);
+	rc = gfx_puttext(res->font, &pos, &fmt, entry->text);
 	if (rc != EOK)
 		goto error;
 
-	rc = gfx_update(entry->res->gc);
+	rc = gfx_update(res->gc);
 	if (rc != EOK)
 		goto error;
@@ -273,6 +277,25 @@
 {
 	ui_entry_t *entry = (ui_entry_t *) arg;
-
-	(void) entry;
+	gfx_coord2_t pos;
+
+	if (event->type == POS_UPDATE) {
+		pos.x = event->hpos;
+		pos.y = event->vpos;
+
+		if (gfx_pix_inside_rect(&pos, &entry->rect)) {
+			if (!entry->pointer_inside) {
+				ui_window_set_ctl_cursor(entry->window,
+				    ui_curs_ibeam);
+				entry->pointer_inside = true;
+			}
+		} else {
+			if (entry->pointer_inside) {
+				ui_window_set_ctl_cursor(entry->window,
+				    ui_curs_arrow);
+				entry->pointer_inside = false;
+			}
+		}
+	}
+
 	return ui_unclaimed;
 }
Index: uspace/lib/ui/src/window.c
===================================================================
--- uspace/lib/ui/src/window.c	(revision 90f1f1988231da4facc94fa385270f4748b2e9cd)
+++ uspace/lib/ui/src/window.c	(revision 73abf491fd74e2df668b93ec7b38c266f85bac09)
@@ -646,4 +646,19 @@
 }
 
+/** Set cursor when pointer is hovering over a control.
+ *
+ * @param window Window
+ * @param cursor Cursor
+ */
+void ui_window_set_ctl_cursor(ui_window_t *window, ui_stock_cursor_t cursor)
+{
+	display_stock_cursor_t dcursor;
+
+	dcursor = wnd_dcursor_from_cursor(cursor);
+
+	if (window->dwindow != NULL)
+		(void) display_window_set_cursor(window->dwindow, dcursor);
+}
+
 /** Paint window
  *
@@ -770,18 +785,12 @@
 }
 
-/** Window decoration requested changing cursor.
- *
- * @param wdecor Window decoration
- * @param arg Argument (window)
- * @param cursor Cursor to set
- */
-static void wd_set_cursor(ui_wdecor_t *wdecor, void *arg,
-    ui_stock_cursor_t cursor)
-{
-	ui_window_t *window = (ui_window_t *) arg;
+/** Get display stock cursor from UI stock cursor.
+ *
+ * @param cursor UI stock cursor
+ * @return Display stock cursor
+ */
+display_stock_cursor_t wnd_dcursor_from_cursor(ui_stock_cursor_t cursor)
+{
 	display_stock_cursor_t dcursor;
-
-	if (cursor == window->cursor)
-		return;
 
 	dcursor = dcurs_arrow;
@@ -803,8 +812,32 @@
 		dcursor = dcurs_size_urdl;
 		break;
-	}
+	case ui_curs_ibeam:
+		dcursor = dcurs_ibeam;
+		break;
+	}
+
+	return dcursor;
+}
+
+/** Window decoration requested changing cursor.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (window)
+ * @param cursor Cursor to set
+ */
+static void wd_set_cursor(ui_wdecor_t *wdecor, void *arg,
+    ui_stock_cursor_t cursor)
+{
+	ui_window_t *window = (ui_window_t *) arg;
+	display_stock_cursor_t dcursor;
+
+	if (cursor == window->cursor)
+		return;
+
+	dcursor = wnd_dcursor_from_cursor(cursor);
 
 	if (window->dwindow != NULL)
 		(void) display_window_set_cursor(window->dwindow, dcursor);
+
 	window->cursor = cursor;
 }