diff --git a/src/BuildingCoolingSystem.js b/src/BuildingCoolingSystem.js
index fd536e43d357d1474ae979ef89bf17fea10e132e..98b4dd55999585a6ffbf1d8dcdb001bb94892c7f 100644
--- a/src/BuildingCoolingSystem.js
+++ b/src/BuildingCoolingSystem.js
@@ -93,10 +93,10 @@ export default class BuildingCoolingSystem extends React.Component {
                       </Label>
                   </Col>
               </Row>
-              <UncontrolledTooltip placement="left" target='PTAC'>
+              <UncontrolledTooltip placement="left" modifiers={{ flip: { behavior: ['left'] }, preventOverflow: {boundariesElement: "viewport"} }} target='PTAC'>
                 Packaged Terminal Air Conditioners (PTAC) and Packaged Terminal Heat Pumps (PTHP) are ductless, convenient, all-in-one heating and cooling solutions.
               </UncontrolledTooltip>
-              <UncontrolledTooltip placement="left" target='VRF'>
+              <UncontrolledTooltip placement="left" modifiers={{ flip: { behavior: ['left'] }, preventOverflow: {boundariesElement: "viewport"} }} target='VRF'>
                 Variable Refrigerant Flow (VRF) systems are typically all-electric systems that use heat pumps to provide space heating and cooling to building spaces.
               </UncontrolledTooltip>
             </div>
diff --git a/src/BuildingTypeSubType.js b/src/BuildingTypeSubType.js
index a64b5ccf29fcb60eed30f0add554558ecaea85cb..55781478beaa91607ca94dd069a67cfc11f4455b 100644
--- a/src/BuildingTypeSubType.js
+++ b/src/BuildingTypeSubType.js
@@ -190,7 +190,7 @@ export default class BuildingTypeSubType extends React.Component {
                           </Label>
                       </Col>
                   </Row>
-                  <UncontrolledTooltip placement="left" target={this.names[id]}>
+                  <UncontrolledTooltip placement="left" modifiers={{ flip: { behavior: ['left'] }, preventOverflow: {boundariesElement: "viewport"} }} target={this.names[id]}>
                     {this.buildingTypeDescription[id]}
                   </UncontrolledTooltip>
                 </div>