diff --git a/adm/style/event/acp_overall_footer_after.html b/adm/style/event/acp_overall_footer_after.html
index 9fdd075..09748c1 100644
--- a/adm/style/event/acp_overall_footer_after.html
+++ b/adm/style/event/acp_overall_footer_after.html
@@ -1,7 +1,9 @@
 {% if S_PWA_OPTIONS %}
 <script>
 	const input = document.getElementById('pwa_short_name');
-	const maxLength = 12;
+	const maxLength = input.maxLength || 12;
+
+	input.maxLength = maxLength * 2;
 
 	input.addEventListener('input', () => {
 		// Use Array.from to count characters correctly
diff --git a/event/listener.php b/event/listener.php
index fe6b689..c235e6e 100644
--- a/event/listener.php
+++ b/event/listener.php
@@ -215,7 +215,7 @@ public function pwa_short_sitename($value, $key)
 	{
 		$placeholder = $this->trim_shortname($this->config['sitename']);
 
-		return '<input id="' . $key . '" type="text" size="40" maxlength="24" name="config[' . $key . ']" value="' . $value . '" placeholder="' . $placeholder . '">';
+		return '<input id="' . $key . '" type="text" size="40" maxlength="12" name="config[' . $key . ']" value="' . $value . '" placeholder="' . $placeholder . '">';
 	}
 
 	/**