diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig
index 2068cd31c..bf2ae9037 100755
--- a/themes/baggy/_pocheit-form.twig
+++ b/themes/baggy/_pocheit-form.twig
@@ -1,4 +1,4 @@
-<div id="bagit-form" class="messages info">
+<div id="bagit-form" class="messages info popup-form">
     <form method="get" action="index.php" target="_blank" id="bagit-form-form">
         <h2>{% trans "Save a link" %}</h2>
         <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">&times;</a>
diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig
index aec902ff9..77cd84610 100644
--- a/themes/baggy/_search-form.twig
+++ b/themes/baggy/_search-form.twig
@@ -1,8 +1,9 @@
-<div id="search-form" class="messages info">
+<div id="search-form" class="messages info popup-form">
 <form method="get" action="index.php">
-        <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
+        <h2>{%trans "Search" %}</h2>
+	<a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
         <input type="hidden" name="view" value="search"></input>
-        <label>{% trans "Search" %}:</label><input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" />
-        <input id="submit-search" type="submit" value="{% trans "Search" %} !"></input>
+        <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield"><br>
+        <input id="submit-search" type="submit" value="{% trans "Search" %}"></input>
 </form>
 </div>
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 4e3404c14..93294359b 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -540,7 +540,7 @@ footer a {
   2.1 = "save a link" related styles
   ========================================================================== */
 
-#bagit-form, #search-form {
+.popup-form {
   background: rgba(0,0,0,0.5);
   position: absolute;
   top: 0;
@@ -549,24 +549,23 @@ footer a {
   height: 100%;
   width: 100%;
   margin: 0;
-  margin-top: -30%;
+  margin-top: -30% !important; /* TODO: get rid of !important here; overridden by .messages selector */
   padding: 2em;
   display: none;
   border-left: 1px #EEE solid;
 }
 
-#bagit-form form, #search-form form {
-  background: #FFF;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 20;
-  border: 10px solid #000;
-  width: 400px;
-  height: 200px;
-  /* margin: -150px 0 0 -300px; */
-  padding: 2em;
-}
+	.popup-form form {
+		background: #FFF;
+		position: absolute;
+		top: 0;
+		left: 0;
+		z-index: 20;
+		border: 10px solid #000;
+		width: 400px;
+		height: 200px;
+		padding: 2em;
+	}
 
 #bagit-form-form .addurl {
 	margin-left: 0;
@@ -650,42 +649,6 @@ a.add-to-wallabag-link-after:after {
   font-size: 0.9em;
 }
 
-/* ==========================================================================
-  2.2 = "search for articles" popup div related styles
-  ========================================================================== */
-#search-form {
-  background: rgba(0,0,0,0.5);
-  position: absolute;
-  top: 0;
-  left: 10em;
-  z-index: 20;
-  height: 100%;
-  width: 100%;
-  margin: 0;
-  margin-top: -30%;
-  padding: 2em;
-  display: none;
-  border-left: 1px #EEE solid;
-}
-
-#search-form form {
-  background: #FFF;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 20;
-  border: 10px solid #000;
-  width: 400px;
-  height: 200px;
-  /* margin: -150px 0 0 -300px; */
-  padding: 2em;
-}
-
-#submit-search{
-margin-left: 4em;
-margin-top:1em;
-}
-
 /* ==========================================================================
    3 = Pictos
    ========================================================================== */
@@ -1053,7 +1016,7 @@ pre code {
     display: none;
   }
 
-  .popup-form, #bagit-form, #search-form {
+  .popup-form {
     left: 0;
     width: 100%;
     border-left: none;