diff --git a/scp/css/scp.css b/scp/css/scp.css
index 684f2c98191fa3918fd200429688d2d3ff057409..e49c2713603793e269b5e700373247bca6aa40d5 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -958,6 +958,21 @@ h2 .reload {
     z-index:700;
 }
 
+.tip_box.right .tip_arrow {
+    top: 5px;
+    right: -12px;
+    left: auto;
+}
+
+.flip-x {
+    -moz-transform: scaleX(-1);
+    -o-transform: scaleX(-1);
+    -webkit-transform: scaleX(-1);
+    transform: scaleX(-1);
+    filter: FlipH;
+    -ms-filter: "FlipH";
+}
+
 .tip_content {
     height:auto !important;
     height:20px;
@@ -1082,6 +1097,7 @@ h2 .reload {
 }
 
 i.help-tip {
+    vertical-align: inherit;
     color: #aaa;
 }
 i.help-tip:hover {
diff --git a/scp/forms.php b/scp/forms.php
index 6b1aba8976927be360c0d74897e01c7bc4f25106..c5f85f7aba5dfd21cde7b3fb40bacdfcb123c95e 100644
--- a/scp/forms.php
+++ b/scp/forms.php
@@ -113,6 +113,7 @@ $page='dynamic-forms.inc.php';
 if($form || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
     $page='dynamic-form.inc.php';
 
+$ost->addExtraHeader('<meta name="tip-namespace" content="forms" />');
 $nav->setTabActive('manage');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
diff --git a/scp/js/tips.js b/scp/js/tips.js
index bb862e8b9710217b4e3221639db1481d6385f7a2..44c924711c1b73bc012674acefce634f007b2eca 100644
--- a/scp/js/tips.js
+++ b/scp/js/tips.js
@@ -74,8 +74,8 @@ jQuery(function() {
 
         var elem = $(this),
             pos = elem.offset(),
-            y_pos = pos.top - 12,
-            x_pos = pos.left + elem.width() + 20,
+            y_pos = pos.top - 8,
+            x_pos = pos.left + elem.width() + 16,
             tip_arrow = $('<img>')
                 .attr('src', './images/tip_arrow.png')
                 .addClass('tip_arrow'),
@@ -85,8 +85,7 @@ jQuery(function() {
                 .append('<a href="#" class="tip_close"><i class="icon-remove-circle"></i></a>')
                 .addClass('tip_content'),
             the_tip = tip_box
-                .append(tip_arrow)
-                .append(tip_content)
+                .append(tip_content.append(tip_arrow))
                 .css({
                     "top":y_pos + "px",
                     "left":x_pos + "px"
@@ -94,6 +93,12 @@ jQuery(function() {
             tip_timer = setTimeout(function() {
                 $('.tip_box').remove();
                 $('body').append(the_tip.hide().fadeIn());
+                console.log($(window).width(), tip_content.width(), the_tip.position())
+                if ($(window).width() < tip_content.outerWidth() + the_tip.position().left) {
+                    the_tip.css({'left':x_pos-tip_content.outerWidth()-40+'px'});
+                    tip_box.addClass('right');
+                    tip_arrow.addClass('flip-x');
+                }
             }, 500);
 
         elem.live('mouseout', function() {