diff --git a/Src/gui/status_bar.cpp b/Src/gui/status_bar.cpp
index db066cc..552442f 100644
--- a/Src/gui/status_bar.cpp
+++ b/Src/gui/status_bar.cpp
@@ -44,7 +44,7 @@ void StatusBar::timeoutCallback()
 
 	if (this->cur_message)
 	{
-		Gui::gui->timerController->arm(this, 500);
+		Gui::gui->timerController->arm(this, 2000);
 		this->setText(text);
 	}
 	else
diff --git a/Src/gui/timer.cpp b/Src/gui/timer.cpp
index 3e86679..dcdfb0b 100644
--- a/Src/gui/timer.cpp
+++ b/Src/gui/timer.cpp
@@ -1,8 +1,8 @@
 #include "timer.hh"
 #include "utils.hh"
+#include "gui.hh"
 
-// FIXME!
-#define MS_TO_TICKS(x) ((x) / 28)
+#define MS_TO_TICKS(x) ((x) / Gui::gui->np->MsPerFrame)
 
 TimerController::TimerController()
 {