diff --git a/source/createdatabase.dfm b/source/createdatabase.dfm
index 35f1638c..ccee72c4 100644
--- a/source/createdatabase.dfm
+++ b/source/createdatabase.dfm
@@ -60,6 +60,7 @@ object CreateDatabaseForm: TCreateDatabaseForm
     Height = 21
     Anchors = [akLeft, akTop, akRight]
     TabOrder = 0
+    TextHint = 'Enter database name'
     OnChange = editDBNameChange
   end
   object comboCharset: TComboBox
diff --git a/source/routine_editor.dfm b/source/routine_editor.dfm
index 84a51fcc..2056ea0a 100644
--- a/source/routine_editor.dfm
+++ b/source/routine_editor.dfm
@@ -137,6 +137,7 @@ object frmRoutineEditor: TfrmRoutineEditor
     Anchors = [akLeft, akTop, akRight]
     TabOrder = 0
     Text = 'editName'
+    TextHint = 'Enter routine name'
     OnChange = editNameChange
   end
   object tlbParameters: TToolBar
diff --git a/source/routine_editor.pas b/source/routine_editor.pas
index 8e883b17..de0cc909 100644
--- a/source/routine_editor.pas
+++ b/source/routine_editor.pas
@@ -178,7 +178,7 @@ begin
     end;
     FreeAndNil(Results);
   end else begin
-    editName.Text := 'Enter routine name';
+    editName.Text := '';
   end;
   editNameChange(Self);
   comboTypeSelect(comboType);
diff --git a/source/table_editor.dfm b/source/table_editor.dfm
index 76744e54..867696a7 100644
--- a/source/table_editor.dfm
+++ b/source/table_editor.dfm
@@ -202,6 +202,7 @@ object frmTableEditor: TfrmTableEditor
         Anchors = [akLeft, akTop, akRight]
         TabOrder = 0
         Text = 'editName'
+        TextHint = 'Enter table name'
         OnChange = editNameChange
       end
       object memoComment: TMemo
diff --git a/source/table_editor.pas b/source/table_editor.pas
index 2333ca8c..30494a1c 100644
--- a/source/table_editor.pas
+++ b/source/table_editor.pas
@@ -282,7 +282,7 @@ begin
 
   if FEditObjectName = '' then begin
     // Creating new table
-    editName.Text := 'Enter table name';
+    editName.Text := '';
     comboCollation.ItemIndex := comboCollation.Items.IndexOf(Mainform.Connection.GetVar('SHOW VARIABLES LIKE ''collation_database''', 1));
     PageControlMain.ActivePage := tabBasic;
   end else begin
diff --git a/source/trigger_editor.dfm b/source/trigger_editor.dfm
index a628d637..fd251963 100644
--- a/source/trigger_editor.dfm
+++ b/source/trigger_editor.dfm
@@ -44,6 +44,7 @@ object frmTriggerEditor: TfrmTriggerEditor
     Anchors = [akLeft, akTop, akRight]
     TabOrder = 0
     Text = 'editName'
+    TextHint = 'Enter trigger name'
     OnChange = Modification
   end
   object SynMemoStatement: TSynMemo
diff --git a/source/trigger_editor.pas b/source/trigger_editor.pas
index 3bece6e6..1b56bc9d 100644
--- a/source/trigger_editor.pas
+++ b/source/trigger_editor.pas
@@ -112,7 +112,7 @@ begin
     if not Found then
       Raise Exception.Create('Trigger definition not found!');
   end else begin
-    editName.Text := 'Enter trigger name';
+    editName.Text := '';
   end;
   Modified := False;
   btnSave.Enabled := Modified;
diff --git a/source/view.dfm b/source/view.dfm
index 8106cd08..c7d86ba0 100644
--- a/source/view.dfm
+++ b/source/view.dfm
@@ -35,6 +35,7 @@ object frmView: TfrmView
     Anchors = [akLeft, akTop, akRight]
     TabOrder = 0
     Text = 'editName'
+    TextHint = 'Enter view name'
     OnChange = editNameChange
   end
   object rgAlgorithm: TRadioGroup
diff --git a/source/view.pas b/source/view.pas
index bc685705..1e6c2ff0 100644
--- a/source/view.pas
+++ b/source/view.pas
@@ -85,7 +85,7 @@ begin
     rx.Free;
   end else begin
     // Create mode
-    editName.Text := 'Enter view name';
+    editName.Text := '';
     rgAlgorithm.Enabled := True;
     rgAlgorithm.ItemIndex := 0;
     rgCheck.Enabled := True;