diff --git a/ChangeLog b/ChangeLog
index 55ac28df7a..87256ef30d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-13  Martin Nordholts  <martinn@svn.gnome.org>
+
+	* app/display/gimpnavigationeditor.c
+	(gimp_navigation_editor_popup): BORDER_PEN_WIDTH is a normal
+	constant, no need for voodoo.
+
 2008-07-13  Martin Nordholts  <martinn@svn.gnome.org>
 
 	* app/display/gimpdisplayshell-scroll.[ch]
diff --git a/app/display/gimpnavigationeditor.c b/app/display/gimpnavigationeditor.c
index e39f8dd7a4..405a73ad22 100644
--- a/app/display/gimpnavigationeditor.c
+++ b/app/display/gimpnavigationeditor.c
@@ -53,6 +53,9 @@
 #include "gimp-intl.h"
 
 
+#define BORDER_PEN_WIDTH  3
+
+
 static void   gimp_navigation_editor_docked_iface_init (GimpDockedInterface  *iface);
 
 static void   gimp_navigation_editor_destroy           (GtkObject            *object);
@@ -269,8 +272,6 @@ gimp_navigation_editor_popup (GimpDisplayShell *shell,
   /* decide where to put the popup */
   gdk_window_get_origin (widget->window, &x_org, &y_org);
 
-#define BORDER_PEN_WIDTH  3
-
   x = (x_org + click_x -
        view->p_x -
        0.5 * (view->p_width  - BORDER_PEN_WIDTH) -
@@ -307,8 +308,6 @@ gimp_navigation_editor_popup (GimpDisplayShell *shell,
   view->motion_offset_x = 0.5 * (view->p_width  - BORDER_PEN_WIDTH);
   view->motion_offset_y = 0.5 * (view->p_height - BORDER_PEN_WIDTH);
 
-#undef BORDER_PEN_WIDTH
-
   gimp_navigation_view_grab_pointer (view);
 }