1 files changed, 4 insertions, 2 deletions
diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index 37dd090d2..81b61a86a 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -83,14 +83,16 @@ $('#modal_grid_{{name}}').on('show.bs.modal', function (e) {
         '#modal_grid_{{name}} .modal-body .current-grid');
     $('#window').appendTo(
         '#modal_grid_{{name}} .modal-body .current-sheets');
-    $('#grid_{{name}}').DataTable().clear().draw()
+    $('#grid_{{name}}').DataTable().clear().draw();
+    current_modal = $("#modal_grid_{{name}}");
 });
 
 $('#modal_grid_{{name}}').on('hide.bs.modal', function (e) {
     $('#grid_{{name}}_wrapper').appendTo(
         '#grid_{{name}}_meta_wrapper');
     $('#window').appendTo('#window_wrapper');
-    $('#grid_{{name}}').DataTable().clear().draw()
+    $('#grid_{{name}}').DataTable().clear().draw();
+    current_modal = null;
 });