diff --git a/daterangepicker.js b/daterangepicker.js
index a6ea6c8b..e2a3128e 100644
--- a/daterangepicker.js
+++ b/daterangepicker.js
@@ -1023,7 +1023,9 @@
 
         move: function() {
             var parentOffset = { top: 0, left: 0 },
-                containerTop;
+                containerTop,
+                drops = this.drops;
+
             var parentRightEdge = $(window).width();
             if (!this.parentEl.is('body')) {
                 parentOffset = {
@@ -1033,10 +1035,21 @@
                 parentRightEdge = this.parentEl[0].clientWidth + this.parentEl.offset().left;
             }
 
-            if (this.drops == 'up')
+            switch (drops) {
+            case 'auto':
+                containerTop = this.element.offset().top + this.element.outerHeight() - parentOffset.top;
+                if (containerTop + this.container.outerHeight() >= this.parentEl[0].scrollHeight) {
+                    containerTop = this.element.offset().top - this.container.outerHeight() - parentOffset.top;
+                    drops = 'up';
+                }
+                break;
+            case 'up':
                 containerTop = this.element.offset().top - this.container.outerHeight() - parentOffset.top;
-            else
+                break;
+            default:
                 containerTop = this.element.offset().top + this.element.outerHeight() - parentOffset.top;
+                break;
+            }
 
             // Force the container to it's actual width
             this.container.css({
@@ -1046,7 +1059,7 @@
             });
             var containerWidth = this.container.outerWidth();
 
-            this.container[this.drops == 'up' ? 'addClass' : 'removeClass']('drop-up');
+            this.container.toggleClass('drop-up', drops == 'up');
 
             if (this.opens == 'left') {
                 var containerRight = parentRightEdge - this.element.offset().left - this.element.outerWidth();
diff --git a/website/index.html b/website/index.html
index a1002644..fb11a40f 100644
--- a/website/index.html
+++ b/website/index.html
@@ -263,7 +263,7 @@ <h2><a data-toggle="nothing" href="#example4">Predefined Date Ranges</a></h2>
                                     }, cb);
 
                                     cb(start, end);
-                                    
+
                                 });
                                 </script>
 
@@ -282,7 +282,7 @@ <h2><a data-toggle="nothing" href="#example5">Input Initially Empty</a></h2>
                             <div class="col-4">
                                 <label>Produces:</label>
                                 <input type="text" name="datefilter" class="form-control pull-right" value="" />
-                                 
+
                                 <script type="text/javascript">
                                 $(function() {
 
@@ -367,7 +367,7 @@ <h1 style="margin-top: 30px"><a id="options" href="#options">Options</a></h1>
                             <code>opens</code>: ('left'/'right'/'center') Whether the picker appears aligned to the left, to the right, or centered under the HTML element it's attached to.
                         </li>
                         <li>
-                            <code>drops</code>: ('down'/'up') Whether the picker appears below (default) or above the HTML element it's attached to.
+                            <code>drops</code>: ('down'/'up'/'auto') Whether the picker appears below (default) or above the HTML element it's attached to.
                         </li>
                         <li>
                             <code>buttonClasses</code>: (string) CSS class names that will be added to both the apply and cancel buttons.
@@ -416,14 +416,14 @@ <h1 style="margin-top: 30px"><a id="methods" href="#methods">Methods</a></h1>
                     <p>
                         You can programmatically update the <code>startDate</code> and <code>endDate</code>
                         in the picker using the <code>setStartDate</code> and <code>setEndDate</code> methods.
-                        You can access the Date Range Picker object and its functions and properties through 
+                        You can access the Date Range Picker object and its functions and properties through
                         data properties of the element you attached it to.
                     </p>
 
                     <script src="https://gist.github.com/dangrossman/8ff9b1220c9b5682e8bd.js"></script>
 
                     <br/>
-                    
+
                     <ul class="nobullets">
                         <li>
                             <code>setStartDate(Date or string)</code>: Sets the date range picker's currently selected start date to the provided date
@@ -482,7 +482,7 @@ <h1 style="margin-top: 30px"><a id="events" href="#events">Events</a></h1>
                     <h1 style="margin-top: 30px"><a id="config" href="#config">Configuration Generator</a></h1>
 
                     <div class="well configurator">
-                                       
+
                       <form>
                           <div class="row">
 
@@ -527,6 +527,7 @@ <h1 style="margin-top: 30px"><a id="config" href="#config">Configuration Generat
                                 <select id="drops" class="form-control">
                                   <option value="down" selected>down</option>
                                   <option value="up">up</option>
+                                  <option value="auto">auto</option>
                                 </select>
                               </div>
 
@@ -737,7 +738,7 @@ <h1 style="margin-top: 30px"><a id="config" href="#comments">Comments</a></h1>
         </script>
 
         <div id="footer">
-            Copyright &copy; 2012-2018 <a href="http://www.dangrossman.info/">Dan Grossman</a>. 
+            Copyright &copy; 2012-2018 <a href="http://www.dangrossman.info/">Dan Grossman</a>.
         </div>
 
     </body>