diff --git a/src/source.cc b/src/source.cc
index 8c62866..a11a531 100644
--- a/src/source.cc
+++ b/src/source.cc
@@ -1472,10 +1472,12 @@ bool Source::ClangViewParse::on_key_press_event(GdkEventKey* key) {
       iter=get_buffer()->get_insert()->get_iter();
       auto found_iter=iter;
       if(find_open_expression_symbol(iter, start_of_sentence_iter, found_iter)) {
-        auto offset=found_iter.get_line_offset();
-        tabs.clear();
-        for(int c=0;c<offset+1;c++)
-          tabs+=' ';
+        auto line=get_line_before(found_iter);
+        if(std::regex_match(line, sm, tabs_regex)) {
+          tabs=sm[1].str();
+          for(int c=0;c<sm[2].str().size()+1;c++)
+            tabs+=' ';
+        }
       }
       else if(std::regex_match(line, sm, no_bracket_statement_regex)) {
         get_source_buffer()->insert_at_cursor("\n"+tabs+tab);
diff --git a/src/window.cc b/src/window.cc
index 343fda6..3743727 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -513,8 +513,13 @@ void Window::new_cpp_project_dialog() {
       Singleton::terminal()->print("Error: "+cpp_main_path.string()+" already exists.\n");
       return;
     }
+    auto tab_char=Singleton::Config::source()->default_tab_char;
+    auto tab_size=Singleton::Config::source()->default_tab_size;
+    std::string tab;
+    for(unsigned c=0;c<tab_size;c++)
+      tab+=tab_char;
     std::string cmakelists="cmake_minimum_required(VERSION 2.8)\n\nproject("+project_name+")\n\nset(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -std=c++1y -Wall\")\n\nadd_executable("+project_name+" main.cpp)\n";
-    std::string cpp_main="#include <iostream>\n\nusing namespace std;\n\nint main() {\n  cout << \"Hello World!\" << endl;\n\n  return 0;\n}\n";
+    std::string cpp_main="#include <iostream>\n\nusing namespace std;\n\nint main() {\n"+tab+"cout << \"Hello World!\" << endl;\n\n"+tab+"return 0;\n}\n";
     if(juci::filesystem::write(cmakelists_path, cmakelists) && juci::filesystem::write(cpp_main_path, cpp_main)) {
       directories.open(project_path);
       notebook.open(cpp_main_path);