diff --git a/NEWS.md b/NEWS.md
index f784df60..172d6403 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -14,6 +14,7 @@ Red Panda C++ Version 2.16
   - enhancement: When first display two editor panes, auto make them the same width
   - change: Don't rebuild the whole project when run/debug, if only contents of project unit file is modified.
   - fix: rebuild may not work, if project's parallel build option is enabled.
+  - enhancement: Add "Close window" and "Move to other view" in the "Window" menu
 
 Red Panda C++ Version 2.15
 
diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp
index d349d163..15aa2488 100644
--- a/RedPandaIDE/mainwindow.cpp
+++ b/RedPandaIDE/mainwindow.cpp
@@ -592,6 +592,8 @@ void MainWindow::updateEditorActions(const Editor *e)
         ui->actionGoto_Declaration->setEnabled(false);
         ui->actionGoto_Definition->setEnabled(false);
         ui->actionFind_references->setEnabled(false);
+
+        ui->actionMove_To_Other_View->setEnabled(false);
     } else {
         ui->actionAuto_Detect->setEnabled(true);
         ui->actionEncode_in_ANSI->setEnabled(true);
@@ -653,6 +655,7 @@ void MainWindow::updateEditorActions(const Editor *e)
         ui->actionGoto_Declaration->setEnabled(e->parser()!=nullptr);
         ui->actionGoto_Definition->setEnabled(e->parser()!=nullptr);
         ui->actionFind_references->setEnabled(e->parser()!=nullptr);
+        ui->actionMove_To_Other_View->setEnabled(editorList()->pageCount()>1);
     }
 
     updateCompileActions(e);
@@ -4964,10 +4967,6 @@ void MainWindow::onEditorTabContextMenu(QTabWidget* tabWidget, const QPoint &pos
     menu.addAction(ui->actionMove_To_Other_View);
     menu.addSeparator();
     menu.addAction(ui->actionFile_Properties);
-    ui->actionMove_To_Other_View->setEnabled(
-                tabWidget==ui->EditorTabsRight
-                || tabWidget->count()>1
-                );
     if (editor ) {
         ui->actionLocate_in_Files_View->setEnabled(!editor->isNew());
     }
diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui
index b1978e4b..334caea9 100644
--- a/RedPandaIDE/mainwindow.ui
+++ b/RedPandaIDE/mainwindow.ui
@@ -136,8 +136,8 @@
     <addaction name="separator"/>
     <addaction name="actionClose"/>
     <addaction name="actionClose_Project"/>
-    <addaction name="actionClose_All"/>
     <addaction name="separator"/>
+    <addaction name="actionClose_All"/>
     <addaction name="actionPrint"/>
     <addaction name="separator"/>
     <addaction name="actionExit"/>
@@ -238,8 +238,10 @@
      <string>Window</string>
     </property>
     <addaction name="actionClose_All"/>
+    <addaction name="actionClose"/>
     <addaction name="actionMaximize_Editor"/>
     <addaction name="separator"/>
+    <addaction name="actionMove_To_Other_View"/>
     <addaction name="actionNext_Editor"/>
     <addaction name="actionPrevious_Editor"/>
    </widget>
@@ -967,6 +969,7 @@
        <widget class="IssuesTable" name="tableIssues">
         <property name="font">
          <font>
+          <weight>50</weight>
           <bold>false</bold>
          </font>
         </property>