diff --git a/Makefile b/Makefile
index bae8932..dda3c23 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
 CPYTHON_PATH = ../cpython
 PYTHON       = python3
 PACKAGE_ABS_PATH = $(shell pwd)/$(shell find dist/python-docs-theme-*.tar.gz)
+SPHINXOPTS   =
 
 
 .PHONY: help
@@ -22,7 +23,7 @@ venv:
 .PHONY: html
 html: venv
 	cd $(CPYTHON_PATH)/Doc && \
-		make html
+		make SPHINXOPTS="$(SPHINXOPTS)" html
 
 .PHONY: htmlview
 htmlview: html
diff --git a/python_docs_theme/static/pydoctheme.css b/python_docs_theme/static/pydoctheme.css
index 4873116..d7b729f 100644
--- a/python_docs_theme/static/pydoctheme.css
+++ b/python_docs_theme/static/pydoctheme.css
@@ -123,7 +123,9 @@ form.inline-search input {
 }
 
 form.inline-search input[type='submit'] {
-    width: 40px;
+    /* In some languages, more than 40px is required */
+    width: auto;
+    min-width: 40px;
 }
 
 div.document {