diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d39b417..ec57572 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -21,7 +21,8 @@ class ApplicationController < ActionController::Base
   include ApplicationHelper
   layout :get_layout
   def get_layout
-    return nil if request.format == :js
+    return nil if request.format == :js or request.xhr?
+
     theme_layout = theme_option(:layout)
     if theme_layout
       theme_view_file('layouts/'+theme_layout) || theme_layout
--
libgit2 0.21.2