diff --git a/ChangeLog.txt b/ChangeLog.txt
index 83d1c0432..8c7aec59e 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -34,6 +34,7 @@
 - [#492] Valentina crashes when add an increment.
 - [#493] Error in seam allowance drawing.
 - [#468] Error - Tape 'Save As' should set 'Read Only' to false.
+- [#501] Rename Window->Close Window to Window->Close pattern
 
 # Version 0.4.4 April 12, 2016
 - Updated measurement templates with all measurements. Added new template Aldrich/Women measurements.
diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp
index 9803a5753..e5acc963f 100644
--- a/src/app/valentina/mainwindow.cpp
+++ b/src/app/valentina/mainwindow.cpp
@@ -2453,7 +2453,7 @@ void MainWindow::Clear()
     qCDebug(vMainWindow, "Returned to Draw mode.");
     pattern->Clear();
     qCDebug(vMainWindow, "Clearing pattern.");
-    if (not curFile.isEmpty())
+    if (not curFile.isEmpty() && not doc->MPath().isEmpty())
     {
         watcher->removePath(AbsoluteMPath(curFile, doc->MPath()));
     }
@@ -2464,6 +2464,10 @@ void MainWindow::Clear()
     sceneDetails->clear();
     ArrowTool();
     comboBoxDraws->clear();
+    ui->actionDraw->setEnabled(false);
+    ui->actionDetails->setEnabled(false);
+    ui->actionLayout->setEnabled(false);
+    ui->actionNewDraw->setEnabled(false);
     ui->actionOptionDraw->setEnabled(false);
     ui->actionSave->setEnabled(false);
     ui->actionSaveAs->setEnabled(false);
@@ -3632,7 +3636,7 @@ void MainWindow::CreateActions()
     connect(ui->actionPattern_properties, &QAction::triggered, this, &MainWindow::PatternProperties);
     ui->actionPattern_properties->setEnabled(false);
     connect(ui->actionEdit_pattern_code, &QAction::triggered, this, &MainWindow::EditPatternCode);
-    connect(ui->actionCloseWindow, &QAction::triggered, this, &MainWindow::ResetWindow);
+    connect(ui->actionClosePattern, &QAction::triggered, this, &MainWindow::ResetWindow);
     connect(ui->actionShowCurveDetails, &QAction::triggered, this, &MainWindow::ActionCurveDetailsMode);
     connect(ui->actionLoadIndividual, &QAction::triggered, this, &MainWindow::LoadIndividual);
     connect(ui->actionLoadStandard, &QAction::triggered, this, &MainWindow::LoadStandard);
diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui
index cc2724466..b3b5d5ff7 100644
--- a/src/app/valentina/mainwindow.ui
+++ b/src/app/valentina/mainwindow.ui
@@ -1251,7 +1251,7 @@
     <property name="title">
      <string>Window</string>
     </property>
-    <addaction name="actionCloseWindow"/>
+    <addaction name="actionClosePattern"/>
    </widget>
    <widget class="QMenu" name="menuHistory">
     <property name="title">
@@ -1975,9 +1975,15 @@
     <enum>QAction::NoRole</enum>
    </property>
   </action>
-  <action name="actionCloseWindow">
+  <action name="actionClosePattern">
    <property name="text">
-    <string>Close window</string>
+    <string>Close pattern</string>
+   </property>
+   <property name="iconText">
+    <string>Close pattern</string>
+   </property>
+   <property name="toolTip">
+    <string>Close pattern</string>
    </property>
    <property name="shortcut">
     <string notr="true"/>