diff --git a/source/childwin.dfm b/source/childwin.dfm
index 3f9e9c9d..2c1b9381 100644
--- a/source/childwin.dfm
+++ b/source/childwin.dfm
@@ -1282,7 +1282,7 @@ object MDIChild: TMDIChild
     object menuAlterTable: TMenuItem
       Action = MainForm.actEditTableProperties
     end
-    object actView1: TMenuItem
+    object menuEditView: TMenuItem
       Action = MainForm.actEditView
     end
     object InsertfilesintoBLOBfields1: TMenuItem
diff --git a/source/childwin.pas b/source/childwin.pas
index 8c47ac0e..3c811589 100644
--- a/source/childwin.pas
+++ b/source/childwin.pas
@@ -230,7 +230,7 @@ type
     lblFilterProcesses: TLabel;
     editFilterProcesses: TEdit;
     menuEditVariable: TMenuItem;
-    actView1: TMenuItem;
+    menuEditView: TMenuItem;
     Createview1: TMenuItem;
     menuTreeCreateView: TMenuItem;
     menuTreeEditView: TMenuItem;
diff --git a/source/main.pas b/source/main.pas
index 9af7fa9e..20616843 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -967,11 +967,11 @@ begin
   ViewForm.EditViewName := '';
   if (Sender as TAction) = actEditView then begin
     // Edit mode
-    if Assigned(Childwin.ListTables.FocusedNode) then begin
+    if actEditView.ActionComponent = Childwin.menuEditView then begin
       // "Edit view" was clicked in ListTables' context menu
       NodeData := Childwin.ListTables.GetNodeData(Childwin.ListTables.FocusedNode);
       ViewForm.EditViewName := NodeData.Captions[0];
-    end else if Childwin.DBtree.GetFirstSelected <> nil then begin
+    end else if actEditView.ActionComponent = Childwin.menuTreeEditView then begin
       // "Edit view" was clicked in DBTree's context menu
       ds := Childwin.FetchDbTableList(Childwin.ActiveDatabase);
       ds.RecNo := Childwin.DBtree.GetFirstSelected.Index+1;