diff --git a/html/admin/js/templates/queryView.ejs b/html/admin/js/templates/queryView.ejs
index 2ebb591df6..a2941144ae 100644
--- a/html/admin/js/templates/queryView.ejs
+++ b/html/admin/js/templates/queryView.ejs
@@ -7,7 +7,7 @@
 <div id="queryDiv" class="form-actions">
   <div id="outputLabel">Result</div>
   <div id="outputToolbar">
-    <i class="icon-trash queryTooltips" title="Clear" id="clearOutput"></i>
+    <i class="icon-ban-circle queryTooltips" title="Clear" id="clearOutput"></i>
     <i class="icon-plus queryTooltips" title="Unfold" id="bigOutput"></i>
     <i class="icon-minus queryTooltips" title="Fold" id="smallOutput"></i>
   </div>
@@ -19,6 +19,7 @@
     <select id="querySelect"/>
     <i class="icon-list-alt queryTooltips" title="Edit custom queries" id="editAQL"/>
     <i class="icon-star queryTooltips" title="Save current query" id="addAQL"/>
+    <i class="icon-ban-circle queryTooltips" title="Clear" id="clearInput"></i>
     <i class="icon-comment queryTooltips" title="Comment" id="commentText"/>
     <i class="icon-arrow-right queryTooltips" title="Redo" id="redoText"/>
     <i class="icon-arrow-left queryTooltips" title="Undo" id="undoText"/>
diff --git a/html/admin/js/views/queryView.js b/html/admin/js/views/queryView.js
index 8c22448792..cf353ab9a5 100644
--- a/html/admin/js/views/queryView.js
+++ b/html/admin/js/views/queryView.js
@@ -20,6 +20,7 @@ var queryView = Backbone.View.extend({
     'click #smallOutput'             : 'smallOutput',
     'click #bigOutput'               : 'bigOutput',
     'click #clearOutput'             : 'clearOutput',
+    'click #clearInput'              : 'clearInput',
     'click #addAQL'                  : 'addAQL',
     'click #editAQL'                 : 'editAQL',
     'click #save-new-query'          : 'saveAQL',
@@ -41,6 +42,11 @@ var queryView = Backbone.View.extend({
     var editor2 = ace.edit("queryOutput");
     editor2.setValue('');
   },
+  
+  clearInput: function() {
+    var editor = ace.edit("aqlEditor");
+    editor.setValue('');
+  },
 
   smallOutput: function() {
     var editor2 = ace.edit("queryOutput");
@@ -186,6 +192,11 @@ var queryView = Backbone.View.extend({
       }
     }
 
+    if (queryName.trim() === '') {
+      arangoHelper.arangoNotification("Illegal query name");
+      return;
+    }
+
     //check for already existing entry
     var tempArray = [];
     var quit = false;