diff --git a/ChangeLog b/ChangeLog
index f73c0f93..01d589f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-05 14:38-EDT Gregory John Casamento <greg.casamento@gmail.com>
+
+	* GormCore/GormMatrixEditor.m: Change modifier to Ctrl+Shift since
+	these two keys are never remapped and Alt does not always exist
+	on european and some US keyboards.   This change should address
+	bug#36096.
+
 2012-03-17  German A. Arias  <german@xelalug.org>
 
 	* Gorm.m: Added method -applicationShouldTerminateAfterLastWindowClosed:
diff --git a/GormCore/GormMatrixEditor.m b/GormCore/GormMatrixEditor.m
index dddb27cf..b71d98ae 100644
--- a/GormCore/GormMatrixEditor.m
+++ b/GormCore/GormMatrixEditor.m
@@ -564,7 +564,7 @@ static BOOL done_editing;
 {
   frame = gpi->lastFrame;
 
-  if ([theEvent modifierFlags] & NSAlternateKeyMask)
+  if ([theEvent modifierFlags] & (NSControlKeyMask | NSShiftKeyMask))
     {
       int rows = [_EO numberOfRows];
       int cols = [_EO numberOfColumns];