diff --git a/mobile/themes/hildon/browser.css b/mobile/themes/hildon/browser.css
index 48487de14a3c..82fbe617ef05 100644
--- a/mobile/themes/hildon/browser.css
+++ b/mobile/themes/hildon/browser.css
@@ -66,12 +66,12 @@ toolbarbutton.urlbar-button {
 }
 
 #tool-app-switch {
-  visibility: hidden;
+  visibility: collapse;
   margin-right: 1mm; /* core spacing */
   list-style-image: url("chrome://browser/skin/images/task-switch-40.png");
 }
 
-#toolbar-main[fullscreen="true"] #tool-app-switch {
+#toolbar-main[fullscreen="true"] #tool-app-switch:not(:-moz-system-metric(maemo-classic)) {
   visibility: visible;
 }