diff --git a/src/source.cc b/src/source.cc
index 6bfc3df..49973a8 100644
--- a/src/source.cc
+++ b/src/source.cc
@@ -1673,7 +1673,8 @@ bool Source::View::on_key_press_event_bracket_language(GdkEventKey* key) {
 
   if(!is_code_iter(iter)) {
     // Add * at start of line in comment blocks
-    if((key->keyval==GDK_KEY_Return || key->keyval==GDK_KEY_KP_Enter) && !iter.starts_line()) {
+    if((key->keyval==GDK_KEY_Return || key->keyval==GDK_KEY_KP_Enter) &&
+       !iter.starts_line() && !iter.has_tag(string_tag) && !iter.ends_tag(string_tag)) {
       cleanup_whitespace_characters_on_return(iter);
       
       iter=get_buffer()->get_insert()->get_iter();
diff --git a/src/source_spellcheck.h b/src/source_spellcheck.h
index 48b77f0..f834ff8 100644
--- a/src/source_spellcheck.h
+++ b/src/source_spellcheck.h
@@ -22,12 +22,13 @@ namespace Source {
     bool is_code_iter(const Gtk::TextIter &iter);
     bool spellcheck_all=false;
     guint last_keyval=0;
-  private:
-    Glib::RefPtr<Gtk::TextTag> spellcheck_error_tag;
     
     Glib::RefPtr<Gtk::TextTag> comment_tag;
     Glib::RefPtr<Gtk::TextTag> string_tag;
     Glib::RefPtr<Gtk::TextTag> no_spell_check_tag;
+  private:
+    Glib::RefPtr<Gtk::TextTag> spellcheck_error_tag;
+    
     sigc::connection signal_tag_added_connection;
     sigc::connection signal_tag_removed_connection;