2 files changed, 15 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 41a35b5..0f71819 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,14 @@ cscope.out
 cscope.files
 ctags.sh
 compile_commands.json
+
+# Ignore some of the Visual Studio files
+/Debug/
+/Release/
+*.VC.db
+*.VC.VC.opendb
+*.sln
+*.vcxproj
+*.vcxproj.filters
+*.vcxproj.user
+*.sdf
diff --git a/Swift/QtUI/Trellis/QtGridSelectionDialog.cpp b/Swift/QtUI/Trellis/QtGridSelectionDialog.cpp
index f03d0ec..f67a4b8 100644
--- a/Swift/QtUI/Trellis/QtGridSelectionDialog.cpp
+++ b/Swift/QtUI/Trellis/QtGridSelectionDialog.cpp
@@ -87,6 +87,10 @@ void QtGridSelectionDialog::keyReleaseEvent(QKeyEvent* event) {
             hide();
             setCurrentGridSize(currentGridSize);
         }
+        else if (event->key() == Qt::Key_Escape) {
+            hide();
+        }
+
         if (minGridSize.expandedTo(newGridSize).boundedTo(maxGridSize) != currentGridSize) {
             currentGridSize = minGridSize.expandedTo(newGridSize).boundedTo(maxGridSize);