diff --git a/static/js/ui-utils.js b/static/js/ui-utils.js
index 4a5e9fcf8..46f220dfc 100644
--- a/static/js/ui-utils.js
+++ b/static/js/ui-utils.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var drawerIsOpen = false;
-var treatmentDrawerIsOpen = false;
+var openDraw = null;
+
 var defaultSettings = {
     'units': 'mg/dl',
     'alarmUrgentHigh': true,
@@ -150,38 +150,43 @@ function isTouch() {
     catch (e) { return false; }
 }
 
-
-function closeDrawer(callback) {
-    $('#container').animate({marginLeft: '0px'}, 300, callback);
-    $('#chartContainer').animate({marginLeft: '0px'}, 300);
-    $('#drawer').animate({right: '-300px'}, 300, function() {
-        $('#drawer').css('display', 'none');
+function closeDrawer(id, callback) {
+    openDraw = null;
+    $(id).animate({right: '-300px'}, 300, function () {
+        $(id).css('display', 'none');
+        if (callback) callback();
     });
-    drawerIsOpen = false;
 }
 
-function openDrawer()  {
-    drawerIsOpen = true;
-    $('#container').animate({marginLeft: '-300px'}, 300);
-    $('#chartContainer').animate({marginLeft: '-300px'}, 300);
-    $('#drawer').css('display', 'block').animate({right: '0'}, 300);
-}
+function toggleDrawer(id, openCallback, closeCallback) {
 
-function closeTreatmentDrawer(callback) {
-    $('#container').animate({marginLeft: '0px'}, 400, callback);
-    $('#chartContainer').animate({marginLeft: '0px'}, 400);
-    $('#treatmentDrawer').animate({right: '-300px'}, 400, function() {
-        $('#treatmentDrawer').css('display', 'none');
-    });
-    treatmentDrawerIsOpen = false;
-}
+    function openDrawer(id, callback) {
+        function closeOpenDraw(callback) {
+            if (openDraw) {
+                closeDrawer(openDraw, callback);
+            } else {
+                callback()
+            }
+        }
 
-function openTreatmentDrawer()  {
-    treatmentDrawerIsOpen = true;
-    $('#container').animate({marginLeft: '-300px'}, 400);
-    $('#chartContainer').animate({marginLeft: '-300px'}, 400);
-    $('#treatmentDrawer').css('display', 'block').animate({right: '0'}, 400);
+        closeOpenDraw(function () {
+            openDraw = id;
+            $(id).css('display', 'block').animate({right: '0'}, 300, function () {
+                if (callback) callback();
+            });
+        });
+
+    }
 
+    if (openDraw == id) {
+        closeDrawer(id, closeCallback);
+    } else {
+        openDrawer(id, openCallback);
+    }
+
+}
+
+function initTreatmentDrawer()  {
     $('#eventType').val('BG Check').focus();
     $('#glucoseValue').val('').attr('placeholder', 'Value in ' + browserSettings.units);
     $('#meter').prop('checked', true);
@@ -289,7 +294,7 @@ function treatmentSubmit(event) {
 
         browserStorage.set('enteredBy', data.enteredBy);
 
-        closeTreatmentDrawer();
+        closeDrawer('#treatmentDrawer');
     }
 
     if (event) {
@@ -322,36 +327,12 @@ Dropdown.prototype.open = function (e) {
 
 
 $('#drawerToggle').click(function(event) {
-    //close other drawers
-    if(treatmentDrawerIsOpen) {
-        closeTreatmentDrawer();
-        treatmentDrawerIsOpen = false;
-    }
-
-    if(drawerIsOpen) {
-        closeDrawer();
-        drawerIsOpen = false;
-    }  else {
-        openDrawer();
-        drawerIsOpen = true;
-    }
+    toggleDrawer('#drawer');
     event.preventDefault();
 });
 
 $('#treatmentDrawerToggle').click(function(event) {
-    //close other drawers
-    if(drawerIsOpen) {
-        closeDrawer();
-        drawerIsOpen = false;
-    }
-
-    if(treatmentDrawerIsOpen) {
-        closeTreatmentDrawer();
-        treatmentDrawerIsOpen = false;
-    }  else {
-        openTreatmentDrawer();
-        treatmentDrawerIsOpen = true;
-    }
+    toggleDrawer('#treatmentDrawer', initTreatmentDrawer);
     event.preventDefault();
 });
 
@@ -409,13 +390,13 @@ $(function() {
         fade: true,
         gravity: 'n',
         opacity: 0.75
-    }
+    };
 
     if (querystring.notify) {
         showNotification(querystring.notify, querystring.notifytype);
     }
 
     if (querystring.drawer) {
-        openDrawer();
+        openDrawer('#drawer');
     }
 });