diff --git a/static/js/overlay/button-frame/button.js b/static/js/overlay/button-frame/button.js
index cd5d26e86..5059d1e78 100644
--- a/static/js/overlay/button-frame/button.js
+++ b/static/js/overlay/button-frame/button.js
@@ -27,7 +27,7 @@ export default class OverlayButtonJS {
         const buttonSize = buttonEl.getBoundingClientRect();
         OverlayButtonJS.notifyParentFrame(new IFrameMessage(ActionTypes.BUTTON_READY, {
           height: buttonSize.height,
-          width: buttonSize.width
+          width: config.labelText ? buttonSize.width : AnimationStyling.DEFAULT_BUTTON_SIZE
         }));
         break;
       case ActionTypes.COLLAPSE:
diff --git a/templates/universal-standard/script/searchbar.hbs b/templates/universal-standard/script/searchbar.hbs
index 1473ccaf3..35a262ad8 100644
--- a/templates/universal-standard/script/searchbar.hbs
+++ b/templates/universal-standard/script/searchbar.hbs
@@ -1,6 +1,6 @@
 const overlayConfig = {
   customHooks: {
-    onSubmit: function (query) {
+    onConductSearch: function (query) {
       window.Overlay.grow();
     },
     onClearSearch: function () {
diff --git a/templates/vertical-grid/script/searchbar.hbs b/templates/vertical-grid/script/searchbar.hbs
index abeafd75a..97e49dad4 100644
--- a/templates/vertical-grid/script/searchbar.hbs
+++ b/templates/vertical-grid/script/searchbar.hbs
@@ -1,6 +1,6 @@
 const overlayConfig = {
   customHooks: {
-    onSubmit: function (query) {
+    onConductSearch: function (query) {
       window.Overlay.grow();
     },
     onClearSearch: function () {
diff --git a/templates/vertical-map/script/searchbar.hbs b/templates/vertical-map/script/searchbar.hbs
index abeafd75a..97e49dad4 100644
--- a/templates/vertical-map/script/searchbar.hbs
+++ b/templates/vertical-map/script/searchbar.hbs
@@ -1,6 +1,6 @@
 const overlayConfig = {
   customHooks: {
-    onSubmit: function (query) {
+    onConductSearch: function (query) {
       window.Overlay.grow();
     },
     onClearSearch: function () {
diff --git a/templates/vertical-standard/script/searchbar.hbs b/templates/vertical-standard/script/searchbar.hbs
index abeafd75a..97e49dad4 100644
--- a/templates/vertical-standard/script/searchbar.hbs
+++ b/templates/vertical-standard/script/searchbar.hbs
@@ -1,6 +1,6 @@
 const overlayConfig = {
   customHooks: {
-    onSubmit: function (query) {
+    onConductSearch: function (query) {
       window.Overlay.grow();
     },
     onClearSearch: function () {