diff --git a/NEWS b/NEWS
index 607a7b4..03f1e76 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+1.6.18: 
+ * Fixed a bug that prevented use of the AltGr key on Polish and other
+   keyboards.
+
 1.6.17: July 26, 2009
  * Fixed a bug that caused ever-growing notes in Internet Explorer 8.
 
diff --git a/config/Version.py b/config/Version.py
index 7e151b8..d7e0272 100644
--- a/config/Version.py
+++ b/config/Version.py
@@ -1,2 +1,2 @@
-VERSION = u"1.6.17"
+VERSION = u"1.6.18"
 TRIAL = False
diff --git a/static/js/Wiki.js b/static/js/Wiki.js
index 2e481a5..9d18d90 100644
--- a/static/js/Wiki.js
+++ b/static/js/Wiki.js
@@ -1111,7 +1111,7 @@ Wiki.prototype.key_pressed = function ( event ) {
     return;
 
   var code = event.key().code;
-  if ( event.modifier().ctrl ) {
+  if ( event.modifier().ctrl && !event.modifier().alt ) { 
     // ctrl-m: make a new note
     if ( code == 77 ) {
       this.create_blank_editor( event );
@@ -1141,7 +1141,7 @@ Wiki.prototype.key_pressed = function ( event ) {
 Wiki.prototype.editor_key_pressed = function ( editor, event ) {
   var code = event.key().code;
 
-  if ( event.modifier().ctrl ) {
+  if ( event.modifier().ctrl && !event.modifier().alt ) { 
     // ctrl-backtick: message with frame HTML contents (for debugging)
     if ( code == 192 || code == 96 ) {
       this.display_message( editor.contents() );