diff --git a/configure b/configure
index e717379577..f9b23f3000 100755
--- a/configure
+++ b/configure
@@ -18298,18 +18298,18 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
 EOF
 
 
-            if test "$wxUSE_TIPWINDOW" = "yes"; then
-                cat >> confdefs.h <<\EOF
-#define wxUSE_TIPWINDOW 1
-EOF
-
-            fi
-
             USES_CONTROLS=1
         fi
     fi
 fi
 
+if test "$wxUSE_TIPWINDOW" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TIPWINDOW 1
+EOF
+
+fi
+
 if test "$USES_CONTROLS" = 1; then
     cat >> confdefs.h <<\EOF
 #define wxUSE_CONTROLS 1
diff --git a/configure.in b/configure.in
index 3956762697..a3bfcb7fa6 100644
--- a/configure.in
+++ b/configure.in
@@ -4513,15 +4513,15 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
         else
             AC_DEFINE(wxUSE_POPUPWIN)
 
-            if test "$wxUSE_TIPWINDOW" = "yes"; then
-                AC_DEFINE(wxUSE_TIPWINDOW)
-            fi
-
             USES_CONTROLS=1
         fi
     fi
 fi
 
+if test "$wxUSE_TIPWINDOW" = "yes"; then
+    AC_DEFINE(wxUSE_TIPWINDOW)
+fi
+
 if test "$USES_CONTROLS" = 1; then
     AC_DEFINE(wxUSE_CONTROLS)
 fi