diff --git a/comp/src/gb.form/.project b/comp/src/gb.form/.project
index 59cbc43c6..ae007cdbb 100644
--- a/comp/src/gb.form/.project
+++ b/comp/src/gb.form/.project
@@ -1,6 +1,6 @@
 # Gambas Project File 3.0
 Title=More controls for graphical components
-Startup=FTestFileView
+Startup=FTestDateChooser
 Icon=.hidden/icon.png
 Version=3.16.90
 VersionFile=1
diff --git a/comp/src/gb.form/.src/MaskBox.class b/comp/src/gb.form/.src/MaskBox.class
index 02ee2e946..5748513d1 100644
--- a/comp/src/gb.form/.src/MaskBox.class
+++ b/comp/src/gb.form/.src/MaskBox.class
@@ -330,9 +330,7 @@ Public Sub TextBox_KeyPress()
   Dim bChange As Boolean
   
   If Not $sMaskOrg Then Return
-  If Me.ReadOnly Then
-    Return
-  Endif
+  If Me.ReadOnly Then Return
   
   sText = UnmaskText(Me.Text)
   sTextOrg = sText
@@ -371,7 +369,7 @@ Public Sub TextBox_KeyPress()
         bBefore = IsRightAlign(iPos) 
       Endif
     
-    Case Key.Tab, Key.BackTab, Key.Up, Key.Down, Key.Enter, Key.Return
+    Case Key.Tab, Key.BackTab, Key.Up, Key.Down, Key.Enter, Key.Return, Key.ControlKey, Key.AltKey, Key.ShiftKey, Key.AltGrKey
       Return
     
     Case Else
diff --git a/comp/src/gb.form/.src/Test/FTableView.form b/comp/src/gb.form/.src/Test/FTableView.form
deleted file mode 100644
index 42fea3855..000000000
--- a/comp/src/gb.form/.src/Test/FTableView.form
+++ /dev/null
@@ -1,17 +0,0 @@
-# Gambas Form File 3.0
-
-{ Form Form
-  MoveScaled(0,0,88,69)
-  Arrangement = Arrange.Fill
-  Margin = True
-  { Panel1 HSplit
-    MoveScaled(5,16,68,34)
-    { tvwMain TableView
-      MoveScaled(0,0,29,27)
-      Expand = True
-      Mode = Select.Single
-      ShowCursor = True
-      Header = GridView.Horizontal
-    }
-  }
-}
diff --git a/comp/src/gb.form/.src/Test/FTableView.class b/comp/src/gb.form/.src/Test/FTestTableView.class
similarity index 100%
rename from comp/src/gb.form/.src/Test/FTableView.class
rename to comp/src/gb.form/.src/Test/FTestTableView.class
diff --git a/comp/src/gb.form/.src/Test/FTestTableView.form b/comp/src/gb.form/.src/Test/FTestTableView.form
new file mode 100644
index 000000000..fa42309d4
--- /dev/null
+++ b/comp/src/gb.form/.src/Test/FTestTableView.form
@@ -0,0 +1,24 @@
+# Gambas Form File 3.0
+
+{ Form Form
+  MoveScaled(0,0,88,69)
+  Arrangement = Arrange.Vertical
+  Margin = True
+  { Panel2 Panel
+    MoveScaled(6,2,62,12)
+    { TextBox1 TextBox
+      MoveScaled(4,4,25,4)
+    }
+    { TextBox2 TextBox
+      MoveScaled(31,4,28,4)
+      Border = False
+    }
+  }
+  { tvwMain TableView
+    MoveScaled(6,21,29,27)
+    Expand = True
+    Mode = Select.Single
+    ShowCursor = True
+    Header = GridView.Horizontal
+  }
+}