diff --git a/src/app/controllers/dashLoader.js b/src/app/controllers/dashLoader.js
index 10123b9fd80..9f036b87fa0 100644
--- a/src/app/controllers/dashLoader.js
+++ b/src/app/controllers/dashLoader.js
@@ -134,6 +134,7 @@ function (angular, _, moment, config) {
 
     $scope.openSaveDropdown = function() {
       $scope.isFavorite = playlistSrv.isCurrentFavorite($scope.dashboard);
+      $scope.saveDropdownOpened = true;
     };
 
     $scope.markAsFavorite = function() {
diff --git a/src/app/controllers/search.js b/src/app/controllers/search.js
index e30031a0713..fd4e97e836d 100644
--- a/src/app/controllers/search.js
+++ b/src/app/controllers/search.js
@@ -99,6 +99,7 @@ function (angular, _, config, $) {
         $element.next().find('.dropdown-toggle').dropdown('toggle');
       }
 
+      $scope.searchOpened = true;
       $scope.giveSearchFocus = $scope.giveSearchFocus + 1;
       $scope.query.query = 'title:';
       $scope.search();
diff --git a/src/app/partials/dashLoader.html b/src/app/partials/dashLoader.html
index 28413d32c0b..cfa74c66af0 100644
--- a/src/app/partials/dashLoader.html
+++ b/src/app/partials/dashLoader.html
@@ -16,15 +16,17 @@
   </a>
 </li>
 
-<li ng-repeat="pulldown in dashboard.nav" ng-controller="PulldownCtrl" ng-show="pulldown.enable"><grafana-simple-panel type="pulldown.type" ng-cloak></grafana-simple-panel></li>
+<li ng-repeat="pulldown in dashboard.nav" ng-controller="PulldownCtrl" ng-show="pulldown.enable">
+	<grafana-simple-panel type="pulldown.type" ng-cloak>
+	</grafana-simple-panel>
+</li>
 
 <li class="dropdown grafana-menu-save">
   <a href="#"  bs-tooltip="'Save'" data-placement="bottom" class="dropdown-toggle" data-toggle="dropdown" ng-click="openSaveDropdown()">
     <i class='icon-save'></i>
   </a>
 
-  <ul class="save-dashboard-dropdown dropdown-menu">
-
+  <ul class="save-dashboard-dropdown dropdown-menu" ng-if="saveDropdownOpened">
     <li>
       <form class="input-prepend nomargin save-dashboard-dropdown-save-form">
         <input class='input-medium' ng-model="dashboard.title" type="text" />
diff --git a/src/app/partials/search.html b/src/app/partials/search.html
index a281bd9b46b..651928488e2 100644
--- a/src/app/partials/search.html
+++ b/src/app/partials/search.html
@@ -16,7 +16,7 @@
     <i class='icon-folder-open'></i>
   </a>
 
-  <ul class="dropdown-menu" id="grafana-search">
+  <ul class="dropdown-menu" id="grafana-search" ng-if="searchOpened">
     <li ng-if="!showImport">
       <div class="grafana-search-panel">
         <div class="search-field-wrapper">