diff --git a/src/pw3270/uiparser/keypad.c b/src/pw3270/uiparser/keypad.c
index d3195db..7f86c4b 100644
--- a/src/pw3270/uiparser/keypad.c
+++ b/src/pw3270/uiparser/keypad.c
@@ -36,6 +36,7 @@
  {
 	int			  width 	= 1;
 	int			  height	= 1;
+	const gchar	* tmp;
 
  	trace("%s(%s,%d,%d)",__FUNCTION__,element_name,(int) keypad->row, (int) keypad->col);
 
@@ -45,21 +46,19 @@
 		keypad_button_start(context, names, values, error, keypad);
  	}
 
- 	if(keypad->widget) {
-
-		// Criou widget, incluir
-		const gchar	* tmp;
+	tmp = ui_get_attribute("width", names, values);
+	if(tmp) {
+		width = atoi(tmp);
+	}
 
-		tmp = ui_get_attribute("width", names, values);
-		if(tmp) {
-			width = atoi(tmp);
-		}
+	tmp = ui_get_attribute("height", names, values);
+	if(tmp) {
+		height = atoi(tmp);
+	}
 
-		tmp = ui_get_attribute("height", names, values);
-		if(tmp) {
-			height = atoi(tmp);
-		}
+ 	if(keypad->widget) {
 
+		// Criou widget, incluir
 		tmp = ui_get_attribute("column", names, values);
 		if(tmp) {
 			keypad->col = atoi(tmp);
@@ -71,7 +70,7 @@
  	}
 
  	if(!strcasecmp(element_name,"row")) {
-		keypad->row++;
+		keypad->row += height;
 		keypad->col = 0;
  	} else {
 		keypad->col += width;
@@ -170,7 +169,7 @@
 	keypad->relief		= ui_get_relief(names, values, GTK_RELIEF_NORMAL);
 	keypad->grid		= GTK_GRID(gtk_grid_new());
 
-	// gtk_grid_set_row_homogeneous(keypad->grid,TRUE);
+	gtk_grid_set_row_homogeneous(keypad->grid,TRUE);
 	gtk_grid_set_column_homogeneous(keypad->grid,TRUE);
 
 	g_object_set_data(G_OBJECT(keypad->grid),"position",(gpointer) keypad->pos);
diff --git a/ui/10keypad.xml b/ui/10keypad.xml
index 805ff01..902cd3a 100644
--- a/ui/10keypad.xml
+++ b/ui/10keypad.xml
@@ -77,9 +77,9 @@
 			<button action='erase' target='all' label="Clear" width='3' />
 			<button action='kybdreset' label="Reset" width='3' />
 		</row>
-		<row>
-			<button action='EraseEOF' label="Erase\nEOF" width='3' />
-			<button action='EraseInput' label="Erase\nInput" width='3' />
+		<row height='2'>
+			<button action='EraseEOF' label="Erase\nEOF" width='3' height='2'/>
+			<button action='EraseInput' label="Erase\nInput" width='3' height='2'/>
 		</row>
 		<row>
 			<button action='Attn' label="Attn" width='3' />
--
libgit2 0.21.2