diff --git a/src/bar_manager.c b/src/bar_manager.c
index 4629ef7a..03ee83af 100644
--- a/src/bar_manager.c
+++ b/src/bar_manager.c
@@ -1011,12 +1011,10 @@ void bar_manager_handle_system_will_sleep(struct bar_manager* bar_manager) {
 void bar_manager_handle_system_woke(struct bar_manager* bar_manager) {
   usleep(100000);
   bar_manager->sleeps = false;
+  bar_manager_display_changed(bar_manager);
   bar_manager_custom_events_trigger(bar_manager,
                                     COMMAND_SUBSCRIBE_SYSTEM_WOKE,
                                     NULL                          );
-
-
-  bar_manager_display_changed(bar_manager);
 }
 
 void bar_manager_handle_notification(struct bar_manager* bar_manager, struct notification* notification) {
diff --git a/src/popup.c b/src/popup.c
index 09b201e4..a676e590 100644
--- a/src/popup.c
+++ b/src/popup.c
@@ -332,8 +332,8 @@ void popup_draw(struct popup* popup) {
   windows_freeze();
   if (!popup->window.id) popup_create_window(popup);
 
-  if (!window_apply_frame(&popup->window, false)
-      && !popup->host->needs_update             ) return;
+  if (!window_apply_frame(&popup->window, false) && !popup->host->needs_update)
+    return;
 
   CGContextClearRect(popup->window.context, popup->background.bounds);
 
diff --git a/src/sketchybar.c b/src/sketchybar.c
index 3def1643..09dcdaab 100644
--- a/src/sketchybar.c
+++ b/src/sketchybar.c
@@ -26,8 +26,8 @@
 #define HELP_OPT_SHRT    "-h"
 
 #define MAJOR 2
-#define MINOR 20
-#define PATCH 1
+#define MINOR 21
+#define PATCH 0
 
 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000
 extern CGError SLSWindowManagementBridgeSetDelegate(void* delegate);