diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 9b25ddad..3ce6ec16 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -571,6 +571,13 @@ jQuery(document).ready(function($) {
   // Click on the menu header with a dropdown menu
   $('#account-nav .drop-down').live('click', function(event) {
     var menuItem = $(this);
+    var menuUl = menuItem.find('> ul');
+
+    menuUl.css('height', 'auto');
+    if(menuUl.height() > $.viewportHeight()) {
+      var windowHeight = $.viewportHeight() - 150;
+      menuUl.css({'height': windowHeight});
+    }
 
     toggleTopMenu(menuItem);
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 57ce40f2..0d7d499b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2797,6 +2797,17 @@ input: -moz-placeholder {
   border: 1px solid #b7b7b7;
   border-top: 0px;
   background-color: #FFFFFF;
+  display:none;
+  position:absolute;
+  height:auto;
+  min-width:200px;
+  left:-1px;
+  z-index:20;
+  border: 1px solid #b7b7b7;
+  border-top: 0px;
+  background-color:#FFFFFF;
+  overflow: hidden;
+  overflow-y: auto;
 }
 
 #header li.last-child > ul {
@@ -2826,6 +2837,7 @@ input: -moz-placeholder {
   margin-right: 6px;
   height: 15px;
   line-height: 15px;
+  overflow: hidden;
 }
 
 #header li.drop-down li > a.separator {