diff --git a/VERSION b/VERSION
index 94f6550..d6ba093 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.0-rc3
+0.9.0-rc4
diff --git a/changelog b/changelog
index 1613ba5..83252ef 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+2018-09-30 - version 0.9.0 RC4
+[+] New feature: borderless windows (thanks to Mark D Horn)
+[+] ScrollTo API for scrollable frame
+[*] Clipper fix
+[*] ChildAt should skip hidden controls and skip a control if its parent
+    is invisble
+[*] Enter key did not work in TableView control
+
 2018-09-06 - version 0.9.0 RC3 (Thanks to Leandro Dorileo)
 [+] New big feature: scrollable Frame
 [+] Custom theme support: overriding theme colors with custom ones
diff --git a/tableview.go b/tableview.go
index 019caf5..97a0349 100644
--- a/tableview.go
+++ b/tableview.go
@@ -797,8 +797,7 @@ func (l *TableView) ProcessEvent(event Event) bool {
 		case term.KeyPgup:
 			l.moveUp(l.height - 3)
 			return true
-		case term.KeyCtrlM:
-		case term.KeyF2:
+		case term.KeyCtrlM, term.KeyF2:
 			if l.selectedRow != -1 && l.selectedCol != -1 && l.onAction != nil {
 				ev := TableEvent{Action: TableActionEdit, Col: l.selectedCol, Row: l.selectedRow}
 				l.onAction(ev)