diff --git a/pandora_console/include/class/WebServerModuleDebug.class.php b/pandora_console/include/class/WebServerModuleDebug.class.php
index 872582e6a3..1683d32a9c 100644
--- a/pandora_console/include/class/WebServerModuleDebug.class.php
+++ b/pandora_console/include/class/WebServerModuleDebug.class.php
@@ -134,7 +134,7 @@ class WebServerModuleDebug extends Wizard
     public function showWebServerDebug()
     {
         // Show QueryResult editor.
-        ui_query_result_editor('webserverdebug');
+        ui_query_result_editor('webserverdebug', false);
         // Spinner for wait loads.
         html_print_div(
             [
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 2ab5c1be83..c2517d0775 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -7303,7 +7303,7 @@ function ui_print_message_dialog($title, $text, $id='', $img='', $text_button=''
  *
  * @return null
  */
-function ui_query_result_editor($name='default')
+function ui_query_result_editor($name='default', $button_in_action_buttons=true)
 {
     $editorSubContainer = html_print_div(
         [
@@ -7379,9 +7379,22 @@ function ui_query_result_editor($name='default')
         ]
     );
 
-    $execute_button = html_print_submit_button(__('Execute query'), 'execute_query', false, ['icon' => 'update'], true);
-    html_print_action_buttons($execute_button);
+    $execute_button = html_print_submit_button(
+        __('Execute query'),
+        'execute_query',
+        false,
+        [
+            'icon'  => 'update',
+            'class' => 'float-right',
+        ],
+        true
+    );
 
+    if ($button_in_action_buttons === true) {
+        html_print_action_buttons($execute_button);
+    } else {
+        echo $execute_button;
+    }
 }