diff --git a/src/app.rs b/src/app.rs
index 0b7a876f..35452cf6 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -153,10 +153,7 @@ impl App {
             self.current_commands.as_slice(),
         );
 
-        self.commit.draw(f, f.size());
-        self.reset.draw(f, f.size());
-        self.help.draw(f, f.size());
-        self.msg.draw(f, f.size());
+        self.draw_popups(f);
     }
 
     ///
@@ -419,6 +416,15 @@ impl App {
         None
     }
 
+    fn draw_popups<B: Backend>(&self, f: &mut Frame<B>) {
+        let size = f.size();
+
+        self.commit.draw(f, size);
+        self.reset.draw(f, size);
+        self.help.draw(f, size);
+        self.msg.draw(f, size);
+    }
+
     fn draw_commands<B: Backend>(
         f: &mut Frame<B>,
         r: Rect,