diff --git a/app/controllers/server/websites_controller.rb b/app/controllers/server/websites_controller.rb
index ae3e1403c72dc357e48f6cd4a534b399fa7dd8a1..2c73354976e21218825ee704f50d4c2333904ec4 100644
--- a/app/controllers/server/websites_controller.rb
+++ b/app/controllers/server/websites_controller.rb
@@ -17,7 +17,6 @@ class Server::WebsitesController < Server::ApplicationController
 
   def update_theme
     @website.update_theme_version
-    redirect_back(fallback_location: server_websites_path, notice: t('server_admin.websites.update_theme_notice', website: @website.to_s))
   end
 
   protected
diff --git a/app/views/server/websites/_list.html.erb b/app/views/server/websites/_list.html.erb
index 527cdab04fc86a08c5593eddc46bc42d74dabc46..7ee7d50ee198025de88dfed683e97295deb425b4 100644
--- a/app/views/server/websites/_list.html.erb
+++ b/app/views/server/websites/_list.html.erb
@@ -26,7 +26,7 @@
           <td>
             <span class="js-version"><%= link_to website.theme_version, website.theme_version_url, target: :_blank if website.theme_version_url.present? %></span><br>
             <%= link_to t('server_admin.websites.buttons.theme.sync'), sync_theme_version_server_website_path(website), method: :post, remote: true, class: button_classes if website.url.present? %>
-            <%= link_to t('server_admin.websites.buttons.theme.update'), update_theme_server_website_path(website), method: :post, class: button_classes if website.url.present? && website.github? %>
+            <%= link_to t('server_admin.websites.buttons.theme.update'), update_theme_server_website_path(website), method: :post, remote: true, class: button_classes if website.url.present? && website.github? %>
           </td>
         </tr>
       <% end %>
diff --git a/app/views/server/websites/update_theme.js.erb b/app/views/server/websites/update_theme.js.erb
new file mode 100644
index 0000000000000000000000000000000000000000..3c122c7eea2bb109d7f73ea935dd97acc853a9e6
--- /dev/null
+++ b/app/views/server/websites/update_theme.js.erb
@@ -0,0 +1,12 @@
+var notyf = new Notyf();
+notyf.open({
+    type: 'success',
+    position: {
+        x: 'center',
+        y: 'bottom'
+    },
+    message: "<%= j(t('server_admin.websites.update_theme_notice', website: @website.to_s)) %>",
+    duration: 5000,
+    ripple: true,
+    dismissible: true
+});