diff --git a/models/site.rb b/models/site.rb
index 8c98dcc3..903bb7b7 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -100,8 +100,12 @@ class Site < Sequel::Model
       if !(values[:domain] =~ /^[a-zA-Z0-9]+\.[a-zA-Z0-9]+$/i)
         errors.add :domain, "Domain provided is not valid. Must take the form of domain.com"
       end
+
+      site = Site[domain: values[:domain]]
+      if !site.nil? && site.id != self.id
+        errors.add :domain, "Domain provided is already being used by another site, please choose another."
+      end
     end
-    
   end
 
   def file_path
diff --git a/views/site_files/text_editor.slim b/views/site_files/text_editor.slim
index 468352c5..9284a6c3 100644
--- a/views/site_files/text_editor.slim
+++ b/views/site_files/text_editor.slim
@@ -122,6 +122,7 @@ css:
         setTheme();
         editor.getSession().setMode("ace/mode/html");
         editor.getSession().setTabSize(2);
+        editor.getSession().setUseWrapMode(true);
         editor.setFontSize(14);
         editor.setShowPrintMargin(false);
       });