diff --git a/js/jquery.hotkeys.js b/js/jquery.hotkeys.js
index e7701f39c..a089719fe 100644
--- a/js/jquery.hotkeys.js
+++ b/js/jquery.hotkeys.js
@@ -1,6 +1,12 @@
 /*jslint browser: true*/
 /*jslint jquery: true*/
 
+
+/**
+ * @deprecated 3.1.0 use JQuery event keys instead
+ * @link https://github.com/Combodo/iTop/pull/345 Ctrl+Enter shortcut added in iTop object forms
+ */
+
 /*
  * jQuery Hotkeys Plugin
  * Copyright 2010, John Resig
diff --git a/pages/run_query.php b/pages/run_query.php
index c197182ca..211061d12 100644
--- a/pages/run_query.php
+++ b/pages/run_query.php
@@ -177,13 +177,14 @@ try
 	$oQueryTextArea->AddCSSClasses(['ibo-input-text', 'ibo-query-oql', 'ibo-is-code']);
 	$oQueryForm->AddSubBlock($oQueryTextArea);
 
-	$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot()."/js/jquery.hotkeys.js");
-	$oP->add_ready_script(<<<EOF
+	$oP->add_ready_script(<<<JS
 $("#expression").select();
-$("#expression").on("keydown", null, "ctrl+return", function() {
-	$(this).closest("form").submit();
+$("#expression").on('keyup', function (oEvent) {
+    if ((oEvent.ctrlKey || oEvent.metaKey) && oEvent.key === 'Enter') {
+        $(this).closest('form').trigger('submit');
+    }
 });
-EOF
+JS
 	);
 
 	if (count($aArgs) > 0) {
diff --git a/tests/php-unit-tests/legacy-tests/VerifyOQL.php b/tests/php-unit-tests/legacy-tests/VerifyOQL.php
index fc8f3bca8..4746c50cc 100644
--- a/tests/php-unit-tests/legacy-tests/VerifyOQL.php
+++ b/tests/php-unit-tests/legacy-tests/VerifyOQL.php
@@ -158,13 +158,14 @@ try
 	$oP->add("<form method=\"post\">\n");
 	$oP->add(Dict::S('UI:RunQuery:ExpressionToEvaluate')."<br/>\n");
 	$oP->add("<textarea cols=\"120\" rows=\"8\" id=\"expression\" name=\"expression\">".utils::EscapeHtml($sExpression)."</textarea>\n");
-	$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot()."/js/jquery.hotkeys.js");
-	$oP->add_ready_script(<<<EOF
+	$oP->add_ready_script(<<<JS
 $("#expression").select();
-$("#expression").on("keydown", null, "ctrl+return", function() {
-	$(this).closest("form").submit();
+$("#expression").on('keyup', function (oEvent) {
+    if ((oEvent.ctrlKey || oEvent.metaKey) && oEvent.key === 'Enter') {
+        $(this).closest('form').trigger('submit');
+    }
 });
-EOF
+JS
 	);
 
 	if (count($aArgs) > 0)