diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php
index 1181adb8f6..42e73afd95 100644
--- a/module/common/view/datatable.fix.html.php
+++ b/module/common/view/datatable.fix.html.php
@@ -1,6 +1,8 @@
 <?php $currentModule = $this->app->rawModule;?>
 <?php $currentMethod = $this->app->rawMethod;?>
 <?php $datatableId   = $this->moduleName . ucfirst($this->methodName);?>
+<?php js::set('currentMethod', $this->app->rawMethod)?>
+<?php js::set('currentModule', $this->app->rawModule)?>
 
 <style>
 #setShowModule {margin-left: 30px;}
@@ -29,7 +31,7 @@ $(function()
                 $dropmenu.append("<li><a href='<?php echo $this->createLink('datatable', 'ajaxCustom', 'id=' . $this->moduleName . '&method=' . $this->methodName)?>' data-toggle='modal' data-type='ajax'><?php echo $lang->datatable->custom?></a></li>");
 
             }
-            $dropmenu.append("<li><a href='javascript:saveDatatableConfig(\"mode\", \"<?php echo $mode == 'table' ? 'datatable' : 'table';?>\", true);' id='switchToDatatable'><?php echo $mode == 'table' ? $lang->datatable->switchToDatatable : $lang->datatable->switchToTable;?></a></li>");
+            if(currentModule != 'execution' && currentMethod != 'all') $dropmenu.append("<li><a href='javascript:saveDatatableConfig(\"mode\", \"<?php echo $mode == 'table' ? 'datatable' : 'table';?>\", true);' id='switchToDatatable'><?php echo $mode == 'table' ? $lang->datatable->switchToDatatable : $lang->datatable->switchToTable;?></a></li>");
             $dropdown.append($dropmenu)
               .appendTo($btnToolbar)
               .on('shown.zui.dropdown', function(){$btnToolbar.closest('.table-header').css('z-index', 11);})
@@ -43,8 +45,6 @@ $(function()
     {
         if('<?php echo $this->app->user->account?>' == 'guest') return;
         datatableId    = '<?php echo $datatableId?>';
-        currentModule  = '<?php echo $currentModule?>';
-        currentMethod  = '<?php echo $currentMethod?>';
         var value      = $('#showModuleModal input[name="showModule"]:checked').val();
         var allModule  = $('#showModuleModal input[name="showAllModule"]:checked').val();
         var showBranch = $('#showModuleModal input[name="showBranch"]:checked').val();