diff --git a/web/src/templates.ts b/web/src/templates.ts
index 68672051a5..5254508cb6 100644
--- a/web/src/templates.ts
+++ b/web/src/templates.ts
@@ -1,6 +1,6 @@
 import Handlebars from "handlebars/runtime.js";
 
-import render_input from "../templates/components/input.hbs";
+import render_input_wrapper from "../templates/components/input_wrapper.hbs";
 
 import * as common from "./common.ts";
 import {default_html_elements, intl} from "./i18n.ts";
@@ -178,10 +178,10 @@ Handlebars.registerHelper("popover_hotkey_hints", (...args) => {
 
 // The below section is for registering global Handlebar partials.
 
-// The "input" partial block located at web/templates/components/input.hbs
+// The "input_wrapper" partial block located at web/templates/components/input_wrapper.hbs
 // is used to wrap any input element that needs to be styled as a Zulip input.
 // Usage example:
-//    {{#> input . input_type="filter-input" custom_classes="inbox-search-wrapper" icon="search" input_button_icon="close"}}
+//    {{#> input_wrapper . input_type="filter-input" custom_classes="inbox-search-wrapper" icon="search" input_button_icon="close"}}
 //        <input type="text" id="{{INBOX_SEARCH_ID}}" class="input-element" value="{{search_val}}" autocomplete="off" placeholder="{{t 'Filter' }}" />
-//    {{/input}}
-Handlebars.registerPartial("input", render_input);
+//    {{/input_wrapper}}
+Handlebars.registerPartial("input_wrapper", render_input_wrapper);
diff --git a/web/templates/components/input.hbs b/web/templates/components/input_wrapper.hbs
similarity index 100%
rename from web/templates/components/input.hbs
rename to web/templates/components/input_wrapper.hbs
diff --git a/web/templates/components/showroom/filter_input.hbs b/web/templates/components/showroom/filter_input.hbs
index 1f97a4cc90..1b799d5fe3 100644
--- a/web/templates/components/showroom/filter_input.hbs
+++ b/web/templates/components/showroom/filter_input.hbs
@@ -1,3 +1,3 @@
-{{#> input input_type="filter-input" icon="search" input_button_icon="close"}}
+{{#> input_wrapper input_type="filter-input" icon="search" input_button_icon="close"}}
     <input class="input-element" type="text" placeholder="{{t 'Filter component' }}" />
-{{/input}}
+{{/input_wrapper}}
diff --git a/web/templates/inbox_view/inbox_view.hbs b/web/templates/inbox_view/inbox_view.hbs
index 9e8d949e73..66e57b65c9 100644
--- a/web/templates/inbox_view/inbox_view.hbs
+++ b/web/templates/inbox_view/inbox_view.hbs
@@ -6,9 +6,9 @@
     {{else}}
     <div class="search_group" id="inbox-filters" role="group">
         {{> ../dropdown_widget widget_name="inbox-filter"}}
-        {{#> input . input_type="filter-input" custom_classes="inbox-search-wrapper" icon="search" input_button_icon="close"}}
+        {{#> input_wrapper . input_type="filter-input" custom_classes="inbox-search-wrapper" icon="search" input_button_icon="close"}}
             <input type="text" id="{{INBOX_SEARCH_ID}}" class="input-element" value="{{search_val}}" autocomplete="off" placeholder="{{t 'Filter' }}" />
-        {{/input}}
+        {{/input_wrapper}}
     </div>
     <div id="inbox-empty-with-search" class="inbox-empty-text empty-list-message">
         {{t "No conversations match your filters."}}
diff --git a/web/templates/left_sidebar.hbs b/web/templates/left_sidebar.hbs
index a2fdbb4cba..a4f15d0e3d 100644
--- a/web/templates/left_sidebar.hbs
+++ b/web/templates/left_sidebar.hbs
@@ -183,9 +183,9 @@
             <span class="unread_count"></span>
         </div>
         <div class="zoom-out-hide direct-messages-search-section left-sidebar-filter-input-container">
-            {{#> input input_type="filter-input" icon="search" input_button_icon="close"}}
+            {{#> input_wrapper input_type="filter-input" icon="search" input_button_icon="close"}}
                 <input type="text" class="input-element direct-messages-list-filter home-page-input" autocomplete="off" placeholder="{{t 'Filter direct messages' }}" />
-            {{/input}}
+            {{/input_wrapper}}
         </div>
     </div>
     {{~!-- squash whitespace --~}}
@@ -210,9 +210,9 @@
                     </span>
                 </div>
                 <div class="left-sidebar-filter-input-container">
-                    {{#> input input_type="filter-input" custom_classes="notdisplayed stream_search_section" icon="search" input_button_icon="close"}}
+                    {{#> input_wrapper input_type="filter-input" custom_classes="notdisplayed stream_search_section" icon="search" input_button_icon="close"}}
                         <input type="text" class="input-element stream-list-filter home-page-input" autocomplete="off" placeholder="{{t 'Filter channels' }}" />
-                    {{/input}}
+                    {{/input_wrapper}}
                 </div>
             </div>
             <div id="topics_header">
diff --git a/web/templates/recent_view_table.hbs b/web/templates/recent_view_table.hbs
index 502b63ea20..90291fde6a 100644
--- a/web/templates/recent_view_table.hbs
+++ b/web/templates/recent_view_table.hbs
@@ -2,9 +2,9 @@
     <div id="recent_filters_group">
         {{> recent_view_filters .}}
     </div>
-    {{#> input . input_type="filter-input" id="recent-view-search-wrapper" icon="search" input_button_icon="close"}}
+    {{#> input_wrapper . input_type="filter-input" id="recent-view-search-wrapper" icon="search" input_button_icon="close"}}
         <input type="text" id="recent_view_search" class="input-element user-list-filter" value="{{ search_val }}" autocomplete="off" placeholder="{{t 'Filter topics (t)' }}" />
-    {{/input}}
+    {{/input_wrapper}}
 </div>
 <div class="table_fix_head">
     <div class="recent-view-container">
diff --git a/web/templates/right_sidebar.hbs b/web/templates/right_sidebar.hbs
index 19070e6d94..f4305565cc 100644
--- a/web/templates/right_sidebar.hbs
+++ b/web/templates/right_sidebar.hbs
@@ -2,9 +2,9 @@
     <div class="right-sidebar-items">
         <div id="user-list">
             <div id="userlist-header">
-                {{#> input input_type="filter-input" id="userlist-header-search" icon="search" input_button_icon="close"}}
+                {{#> input_wrapper input_type="filter-input" id="userlist-header-search" icon="search" input_button_icon="close"}}
                     <input type="text" class="input-element user-list-filter home-page-input" autocomplete="off" placeholder="{{t 'Filter users' }}" />
-                {{/input}}
+                {{/input_wrapper}}
                 <span id="buddy-list-menu-icon" class="user-list-sidebar-menu-icon">
                     <i class="zulip-icon zulip-icon-more-vertical" aria-hidden="true"></i>
                 </span>