diff --git a/gajim/common/connection.py b/gajim/common/connection.py
index c4fa75fa8..ea0a8e6e3 100644
--- a/gajim/common/connection.py
+++ b/gajim/common/connection.py
@@ -55,10 +55,6 @@ except Exception:
     randomsource = random.Random()
     randomsource.seed()
 
-import signal
-if os.name != 'nt':
-    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
-
 if os.name == 'nt':
     import certifi
 import OpenSSL.crypto
diff --git a/gajim/gajim.py b/gajim/gajim.py
index d07b70e3e..8c4707b0c 100644
--- a/gajim/gajim.py
+++ b/gajim/gajim.py
@@ -78,7 +78,7 @@ def _init_gtk():
     from gajim.application import GajimApplication
 
     application = GajimApplication()
-    _install_terminate(application)
+    _install_sginal_handlers(application)
     application.run(sys.argv)
 
 
@@ -100,13 +100,15 @@ def _set_proc_title():
             libc.setproctitle('gajim')
 
 
-def _install_terminate(application):
+def _install_sginal_handlers(application):
     def sigint_cb(num, stack):
         print('SIGINT/SIGTERM received')
         application.quit()
     # ^C exits the application normally
     signal.signal(signal.SIGINT, sigint_cb)
     signal.signal(signal.SIGTERM, sigint_cb)
+    if os.name != 'nt':
+        signal.signal(signal.SIGPIPE, signal.SIG_DFL)
 
 
 def main():